From f0145ba57ad64b01bf2d08bb86ed1d658fbd846c Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Sat, 13 Dec 2014 15:13:17 -0800 Subject: [PATCH] semi-final tagmanager cleaning The next cleaning will be actually moving to the core! --- .../denizen/npc/speech/DenizenChat.java | 15 +++++++-------- .../net/aufdemrand/denizen/objects/dScript.java | 13 +++++-------- .../denizen/scripts/commands/CommandExecuter.java | 7 +++---- .../net/aufdemrand/denizen/tags/TagManager.java | 13 ------------- 4 files changed, 15 insertions(+), 33 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java b/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java index b6f696c50d..5414f69681 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java +++ b/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java @@ -5,6 +5,7 @@ import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.queues.ScriptQueue; +import net.aufdemrand.denizen.tags.BukkitTagContext; import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.ai.speech.SpeechContext; @@ -52,14 +53,14 @@ public void talk(SpeechContext speechContext) { // Chat to the world using Denizen chat settings if (!context.hasRecipients()) { - String text = TagManager.tag(((BukkitScriptEntryData)entry.entryData).getPlayer(), ((BukkitScriptEntryData)entry.entryData).getNPC(), Settings.chatNoTargetFormat(), false, entry); + String text = TagManager.tag(Settings.chatNoTargetFormat(), new BukkitTagContext(entry, false)); talkToBystanders(talker, text, context); } // Single recipient else if (context.size() <= 1) { // Send chat to target - String text = TagManager.tag(((BukkitScriptEntryData)entry.entryData).getPlayer(), ((BukkitScriptEntryData)entry.entryData).getNPC(), Settings.chatToTargetFormat(), false, entry); + String text = TagManager.tag(Settings.chatToTargetFormat(), new BukkitTagContext(entry, false)); for (Talkable entity : context) { entity.talkTo(context, text, this); } @@ -69,8 +70,7 @@ else if (context.size() <= 1) { if (queue.hasDefinition("target")) defTarget = queue.getDefinition("target"); queue.addDefinition("target", new dEntity(context.iterator().next().getEntity()).identify()); - String bystanderText = TagManager.tag(((BukkitScriptEntryData)entry.entryData).getPlayer(), ((BukkitScriptEntryData)entry.entryData).getNPC(), - Settings.chatWithTargetToBystandersFormat(), false, entry); + String bystanderText = TagManager.tag(Settings.chatWithTargetToBystandersFormat(), new BukkitTagContext(entry, false)); talkToBystanders(talker, bystanderText, context); if (defTarget != null) queue.addDefinition("target", defTarget); @@ -80,7 +80,7 @@ else if (context.size() <= 1) { // Multiple recipients else { // Send chat to targets - String text = TagManager.tag(((BukkitScriptEntryData)entry.entryData).getPlayer(), ((BukkitScriptEntryData)entry.entryData).getNPC(), Settings.chatToTargetFormat(), false, entry); + String text = TagManager.tag(Settings.chatToTargetFormat(), new BukkitTagContext(entry, false)); for (Talkable entity : context) { entity.talkTo(context, text, this); } @@ -99,15 +99,14 @@ else if (context.size() <= 1) { parsed.append(format[i]).append(new dEntity(iter.next().getEntity()).getName()); i++; } - String targets = TagManager.tag(((BukkitScriptEntryData)entry.entryData).getPlayer(), ((BukkitScriptEntryData)entry.entryData).getNPC(), parsed.toString(), false, entry); + String targets = TagManager.tag(parsed.toString(), new BukkitTagContext(entry, false)); String defTargets = null; if (queue.hasDefinition("targets")) defTargets = queue.getDefinition("targets"); queue.addDefinition("targets", targets); - String bystanderText = TagManager.tag(((BukkitScriptEntryData)entry.entryData).getPlayer(), ((BukkitScriptEntryData)entry.entryData).getNPC(), - Settings.chatWithTargetsToBystandersFormat(), false, entry); + String bystanderText = TagManager.tag(Settings.chatWithTargetsToBystandersFormat(), new BukkitTagContext(entry, false)); talkToBystanders(talker, bystanderText, context); if (defTargets != null) diff --git a/src/main/java/net/aufdemrand/denizen/objects/dScript.java b/src/main/java/net/aufdemrand/denizen/objects/dScript.java index 35af147806..8379727bbe 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dScript.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dScript.java @@ -8,6 +8,7 @@ import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.containers.ScriptContainer; import net.aufdemrand.denizen.tags.Attribute; +import net.aufdemrand.denizen.tags.BukkitTagContext; import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; @@ -293,13 +294,11 @@ public String getAttribute(Attribute attribute) { if (obj instanceof List) { dList list = new dList(); for (Object each : (List) obj) - list.add(TagManager.tag(attribute.getScriptEntry() == null ? null: ((BukkitScriptEntryData)attribute.getScriptEntry().entryData).getPlayer(), - attribute.getScriptEntry() == null ? null: ((BukkitScriptEntryData)attribute.getScriptEntry().entryData).getNPC(), each.toString(), false, attribute.getScriptEntry())); + list.add(TagManager.tag(each.toString(), new BukkitTagContext(attribute.getScriptEntry(), false))); return list.getAttribute(attribute.fulfill(1)); } - else return new Element(TagManager.tag(attribute.getScriptEntry() == null ? null: ((BukkitScriptEntryData)attribute.getScriptEntry().entryData).getPlayer(), - attribute.getScriptEntry() == null ? null: ((BukkitScriptEntryData)attribute.getScriptEntry().entryData).getNPC(), obj.toString(), false, attribute.getScriptEntry())) + else return new Element(TagManager.tag(obj.toString(), new BukkitTagContext(attribute.getScriptEntry(), false))) .getAttribute(attribute.fulfill(1)); } @@ -327,13 +326,11 @@ else return new Element(TagManager.tag(attribute.getScriptEntry() == null ? null if (obj instanceof List) { dList list = new dList(); for (Object each : (List) obj) - list.add(TagManager.tag(attribute.getScriptEntry() == null ? null: ((BukkitScriptEntryData)attribute.getScriptEntry().entryData).getPlayer(), - attribute.getScriptEntry() == null ? null: ((BukkitScriptEntryData)attribute.getScriptEntry().entryData).getNPC(), each.toString(), false, attribute.getScriptEntry())); + list.add(TagManager.tag(each.toString(), new BukkitTagContext(attribute.getScriptEntry(), false))); return list.getAttribute(attribute.fulfill(1)); } - else return new Element(TagManager.tag(attribute.getScriptEntry() == null ? null: ((BukkitScriptEntryData)attribute.getScriptEntry().entryData).getPlayer(), - attribute.getScriptEntry() == null ? null: ((BukkitScriptEntryData)attribute.getScriptEntry().entryData).getNPC(), obj.toString(), false, attribute.getScriptEntry())) + else return new Element(TagManager.tag(obj.toString(), new BukkitTagContext(attribute.getScriptEntry(), false))) .getAttribute(attribute.fulfill(1)); } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java index d1a5a59573..920eb98660 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java @@ -172,7 +172,7 @@ public boolean execute(ScriptEntry scriptEntry) { // Fill player/off-line player if (arg.matchesPrefix("player") && !if_ignore) { dB.echoDebug(scriptEntry, "...replacing the linked player with " + arg.getValue()); - String value = TagManager.tag(((BukkitScriptEntryData)scriptEntry.entryData).getPlayer(), ((BukkitScriptEntryData)scriptEntry.entryData).getNPC(), arg.getValue(), false, scriptEntry); + String value = TagManager.tag(arg.getValue(), new BukkitTagContext(scriptEntry, false)); dPlayer player = dPlayer.valueOf(value); if (player == null || !player.isValid()) { dB.echoError(scriptEntry.getResidingQueue(), value + " is an invalid player!"); @@ -184,7 +184,7 @@ public boolean execute(ScriptEntry scriptEntry) { // Fill NPCID/NPC argument else if (arg.matchesPrefix("npc, npcid") && !if_ignore) { dB.echoDebug(scriptEntry, "...replacing the linked NPC with " + arg.getValue()); - String value = TagManager.tag(((BukkitScriptEntryData)scriptEntry.entryData).getPlayer(), ((BukkitScriptEntryData)scriptEntry.entryData).getNPC(), arg.getValue(), false, scriptEntry); + String value = TagManager.tag(arg.getValue(), new BukkitTagContext(scriptEntry, false)); dNPC npc = dNPC.valueOf(value); if (npc == null || !npc.isValid()) { dB.echoError(scriptEntry.getResidingQueue(), value + " is an invalid NPC!"); @@ -195,8 +195,7 @@ else if (arg.matchesPrefix("npc, npcid") && !if_ignore) { // Save the scriptentry if needed later for fetching scriptentry context else if (arg.matchesPrefix("save") && !if_ignore) { - String saveName = TagManager.tag(((BukkitScriptEntryData)scriptEntry.entryData).getPlayer(), - ((BukkitScriptEntryData)scriptEntry.entryData).getNPC(), arg.getValue(), false, scriptEntry); + String saveName = TagManager.tag(arg.getValue(), new BukkitTagContext(scriptEntry, false)); dB.echoDebug(scriptEntry, "...remembering this script entry as '" + saveName + "'!"); scriptEntry.getResidingQueue().holdScriptEntry(saveName, scriptEntry); } diff --git a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java index 093580d810..d9e9fbc5c9 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java +++ b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java @@ -1,9 +1,7 @@ package net.aufdemrand.denizen.tags; -import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.objects.*; -import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.tags.core.*; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; @@ -287,17 +285,6 @@ public static String readSingleTag(String str, TagContext context) { } } - @Deprecated // TODO: Delete all usages - public static String tag(dPlayer player, dNPC npc, String arg, boolean instant, ScriptEntry scriptEntry) { - try { - return tag(arg, new BukkitTagContext(player, npc, instant, scriptEntry, scriptEntry.shouldDebug(), null)); - } - catch (Exception e) { - dB.echoError(e); - return null; - } - } - public static String tag(String arg, TagContext context) { if (arg == null) return null;