Skip to content

Commit

Permalink
Debug cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@aufdemrand
aufdemrand committed Apr 8, 2013
1 parent c1a6198 commit f6f6d5f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 80 deletions.
4 changes: 3 additions & 1 deletion src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java
View file
Expand Up @@ -115,6 +115,9 @@ else if (aH.matchesValueArg("NPCID", arg, aH.ArgumentType.String)) {

scriptEntry.setArguments(plugin.tagManager().fillArguments(scriptEntry.getArguments(), scriptEntry, false));

// dBug the filled arguments
dB.echoDebug(ChatColor.AQUA + "+> " + ChatColor.DARK_GRAY + "Filled tags: " + scriptEntry.getArguments().toString());

// Parse the rest of the arguments for execution.
command.parseArgs(scriptEntry);
} catch (InvalidArgumentsException e) {
Expand Down Expand Up @@ -154,7 +157,6 @@ else if (aH.matchesValueArg("NPCID", arg, aH.ArgumentType.String)) {
else e.printStackTrace();
}
}
dB.echoDebug(DebugElement.Footer);

return true;

Expand Down
67 changes: 4 additions & 63 deletions src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java
View file
Expand Up @@ -24,49 +24,9 @@

public abstract class AbstractTrigger implements RegistrationableInstance {

/**
* Contains required options for a Trigger in a single class for the
* ability to add optional options in the future.
*
*/
public class TriggerOptions {
public boolean ENABLED_BY_DEFAULT = true;
public double DEFAULT_COOLDOWN = -1;
public double DEFAULT_RADIUS = -1;
public CooldownType DEFAULT_COOLDOWN_TYPE = CooldownType.NPC;

public TriggerOptions() { }

public TriggerOptions(boolean enabledByDefault, String defaultCooldown) {
this.ENABLED_BY_DEFAULT = enabledByDefault;
this.DEFAULT_COOLDOWN = Duration.valueOf(defaultCooldown).getSeconds();
}

public TriggerOptions(boolean enabledByDefault, String defaultCooldown, CooldownType defaultCooldownType) {
this.ENABLED_BY_DEFAULT = enabledByDefault;
this.DEFAULT_COOLDOWN = Duration.valueOf(defaultCooldown).getSeconds();
this.DEFAULT_COOLDOWN_TYPE = defaultCooldownType;
}

public TriggerOptions(boolean enabledByDefault, String defaultCooldown, double defaultRadius) {
this.ENABLED_BY_DEFAULT = enabledByDefault;
this.DEFAULT_COOLDOWN = Duration.valueOf(defaultCooldown).getSeconds();
this.DEFAULT_RADIUS = defaultRadius;
}

public TriggerOptions(boolean enabledByDefault, String defaultCooldown, double defaultRadius, CooldownType defaultCooldownType) {
this.ENABLED_BY_DEFAULT = enabledByDefault;
this.DEFAULT_COOLDOWN = Duration.valueOf(defaultCooldown).getSeconds();
this.DEFAULT_RADIUS = defaultRadius;
this.DEFAULT_COOLDOWN_TYPE = defaultCooldownType;
}
}

public Denizen denizen;
protected String name;

public TriggerOptions triggerOptions = new TriggerOptions();

@Override
public AbstractTrigger activate() {
denizen = (Denizen) Bukkit.getPluginManager().getPlugin("Denizen");
Expand All @@ -86,11 +46,7 @@ public AbstractTrigger as(String triggerName) {
public String getName() {
return name;
}

public TriggerOptions getOptions() {
return triggerOptions;
}


/**
* Part of the Plugin disable sequence.
*
Expand All @@ -109,28 +65,13 @@ public boolean parse(dNPC npc, Player player, InteractScriptContainer script) {
public boolean parse(dNPC npc, Player player, InteractScriptContainer script, String id) {
if (npc == null || player == null || script == null) return false;

dB.echoDebug(DebugElement.Header, "Parsing " + name + " trigger: " + npc.getName() + "/" + player.getName());

List<ScriptEntry> entries = script.getEntriesFor(this.getClass(), player, npc, id);
if (entries.isEmpty()) return false;

if (entries.isEmpty()) {
dB.echoDebug(DebugElement.Footer);
return false;
}
dB.echoDebug(DebugElement.Header, "Parsing " + name + " trigger: " + npc.getName() + "/" + player.getName());
ScriptQueue._getQueue(ScriptQueue._getNextId()).addEntries(entries).start();
dB.echoDebug(DebugElement.Footer);
return true;
}

public AbstractTrigger withOptions(boolean enabledByDefault, String defaultCooldown, CooldownType defaultCooldownType) {
this.triggerOptions = new TriggerOptions(enabledByDefault, defaultCooldown, defaultCooldownType);
return this;
}

public AbstractTrigger withOptions(boolean enabledByDefault, String defaultCooldown,
double defaultRadius, CooldownType defaultCooldownType) {
this.triggerOptions = new TriggerOptions(enabledByDefault, defaultCooldown, defaultRadius, defaultCooldownType);
return this;
return true;
}

/**
Expand Down
12 changes: 4 additions & 8 deletions src/main/java/net/aufdemrand/denizen/scripts/triggers/TriggerRegistry.java
View file
Expand Up @@ -96,14 +96,10 @@ public boolean register(String triggerName, RegistrationableInstance instance) {

@Override
public void registerCoreMembers() {
new ClickTrigger().activate().as("Click").withOptions(Settings.TriggerEnabled("Click"),
Settings.TriggerDefaultCooldown("Click"), CooldownType.PLAYER);
new ChatTrigger().activate().as("Chat").withOptions(Settings.TriggerEnabled("Chat"),
Settings.TriggerDefaultCooldown("Chat"), Settings.TriggerDefaultRange("Chat"), CooldownType.PLAYER);
new DamageTrigger().activate().as("Damage").withOptions(Settings.TriggerEnabled("Damage"),
Settings.TriggerDefaultCooldown("Damage"), CooldownType.NPC);
new ProximityTrigger().activate ().as("Proximity").withOptions(Settings.TriggerEnabled("Proximity"),
Settings.TriggerDefaultCooldown("Proximity"), Settings.TriggerDefaultRange("Proximity"), CooldownType.PLAYER);
new ClickTrigger().activate().as("Click");
new ChatTrigger().activate().as("Chat");
new DamageTrigger().activate().as("Damage");
new ProximityTrigger().activate ().as("Proximity");
dB.echoApproval("Loaded core triggers: " + instances.keySet().toString());
}

Expand Down
12 changes: 5 additions & 7 deletions src/main/java/net/aufdemrand/denizen/tags/core/FlagTags.java
View file
Expand Up @@ -61,20 +61,20 @@ public void flagTag(ReplaceableTagEvent event) {
// Check flag replacement type
if (event.getType().toUpperCase().startsWith("G")) {
if (denizen.flagManager().getGlobalFlag(flagName).get(index).isEmpty()) {
dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' flag not found, using fallback!", flagName);
// dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' flag not found, using fallback!", flagName);
} else {
FlagManager.Flag flag = denizen.flagManager().getGlobalFlag(flagName);
event.setReplaced(getReplaceable(flag, flag.get(index), replaceType));
dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' with flag value '" + event.getReplaced() + "'.", flagName);
// dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' with flag value '" + event.getReplaced() + "'.", flagName);
}

} else if (event.getType().toUpperCase().startsWith("D") || event.getType().toUpperCase().startsWith("N")) {
if (denizen.flagManager().getNPCFlag(event.getNPC().getId(), flagName).get(index).isEmpty()) {
dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' flag not found, using fallback!", flagName);
// dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' flag not found, using fallback!", flagName);
} else {
FlagManager.Flag flag = denizen.flagManager().getNPCFlag(event.getNPC().getId(), flagName);
event.setReplaced(getReplaceable(flag, flag.get(index), replaceType));
dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' with flag value '" + event.getReplaced() + "'.", flagName);
// dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' with flag value '" + event.getReplaced() + "'.", flagName);
}

} else if (event.getType().toUpperCase().startsWith("P")) {
Expand All @@ -91,12 +91,10 @@ public void flagTag(ReplaceableTagEvent event) {
if (denizen.flagManager().getPlayerFlag(name, flagName).get(index).isEmpty()) {
if (replaceType.toString() == "ISEXPIRED")
event.setReplaced("true");
else
dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' flag not found, using fallback!", flagName);
} else {
FlagManager.Flag flag = denizen.flagManager().getPlayerFlag(name, flagName);
event.setReplaced(getReplaceable(flag, flag.get(index), replaceType));
dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' with flag value '" + event.getReplaced() + "'.", flagName);
// dB.echoDebug(ChatColor.YELLOW + "//REPLACED//" + ChatColor.WHITE + " '%s' with flag value '" + event.getReplaced() + "'.", flagName);

}
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java
View file
Expand Up @@ -11,6 +11,7 @@
import net.citizensnpcs.api.ai.event.NavigationCancelEvent;
import net.citizensnpcs.api.ai.event.NavigationCompleteEvent;

import org.bukkit.ChatColor;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand All @@ -36,7 +37,7 @@ public void npcTags(ReplaceableTagEvent event) {
String subType = event.getSubType() != null ? event.getSubType().toUpperCase() : "";

if (type.equals("NAME")) {
event.setReplaced(n.getName());
event.setReplaced(ChatColor.stripColor(n.getName()));
if (subType.equals("NICKNAME")) {
if (n.getCitizen().hasTrait(NicknameTrait.class))
event.setReplaced(n.getCitizen().getTrait(NicknameTrait.class).getNickname());
Expand Down

0 comments on commit f6f6d5f

Please sign in to comment.