diff --git a/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java b/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java index 8dae80c8..42a49701 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java @@ -476,7 +476,7 @@ public Object getObject(String key) { } } - public T getdObject(String key) { + public T getObjectTag(String key) { try { // If an ENUM, return as an Element Object gotten = objects.get(key); diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/AdjustCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/AdjustCommand.java index 573cf8f2..fde7d7a4 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/AdjustCommand.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/AdjustCommand.java @@ -153,7 +153,7 @@ public void execute(ScriptEntry scriptEntry) { ElementTag mechanism = scriptEntry.getElement("mechanism"); ElementTag value = scriptEntry.getElement("mechanism_value"); - ListTag objects = scriptEntry.getdObject("object"); + ListTag objects = scriptEntry.getObjectTag("object"); if (scriptEntry.dbCallShouldDebug()) { Debug.report(scriptEntry, getName(), diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java index 4da7da77..899d5a00 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java @@ -104,8 +104,8 @@ public void execute(final ScriptEntry scriptEntry) { final ElementTag url = scriptEntry.getElement("url"); final ElementTag postData = scriptEntry.getElement("post"); - final DurationTag timeout = scriptEntry.getdObject("timeout"); - final ListTag headers = scriptEntry.getdObject("headers"); + final DurationTag timeout = scriptEntry.getObjectTag("timeout"); + final ListTag headers = scriptEntry.getObjectTag("headers"); final ElementTag saveFile = scriptEntry.getElement("savefile"); if (scriptEntry.dbCallShouldDebug()) { diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/file/YamlCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/file/YamlCommand.java index e78eb0a8..42efd244 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/file/YamlCommand.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/file/YamlCommand.java @@ -288,7 +288,7 @@ public void execute(final ScriptEntry scriptEntry) { ElementTag filename = scriptEntry.getElement("filename"); ElementTag rawText = scriptEntry.getElement("raw_text"); ElementTag key = scriptEntry.getElement("key"); - ObjectTag value = scriptEntry.getdObject("value"); + ObjectTag value = scriptEntry.getObjectTag("value"); ElementTag split = scriptEntry.getElement("split"); YAML_Action yaml_action = (YAML_Action) scriptEntry.getObject("yaml_action"); ElementTag actionElement = scriptEntry.getElement("action"); diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineCommand.java index 262f66e4..0d3c3459 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineCommand.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineCommand.java @@ -113,7 +113,7 @@ else if (!scriptEntry.hasObject("value")) { public void execute(ScriptEntry scriptEntry) { ElementTag definition = scriptEntry.getElement("definition"); - ObjectTag value = scriptEntry.getdObject("value"); + ObjectTag value = scriptEntry.getObjectTag("value"); ElementTag remove = scriptEntry.getElement("remove"); Object actionObj = scriptEntry.getObject("action"); DataAction action = actionObj == null ? null : (DataAction) actionObj; diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DetermineCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DetermineCommand.java index 9d96ca30..8f4ca5fa 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DetermineCommand.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DetermineCommand.java @@ -75,7 +75,7 @@ else if (!scriptEntry.hasObject("outcome")) { @Override public void execute(ScriptEntry scriptEntry) { - ObjectTag outcomeObj = scriptEntry.getdObject("outcome"); + ObjectTag outcomeObj = scriptEntry.getObjectTag("outcome"); ElementTag passively = scriptEntry.getElement("passively"); // Report! diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/InjectCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/InjectCommand.java index fe9a1e48..1a5ad23e 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/InjectCommand.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/InjectCommand.java @@ -87,15 +87,15 @@ public void execute(ScriptEntry scriptEntry) { if (scriptEntry.dbCallShouldDebug()) { Debug.report(scriptEntry, getName(), - (scriptEntry.hasObject("script") ? scriptEntry.getdObject("script").debug() : scriptEntry.getScript().debug()) - + (scriptEntry.hasObject("instant") ? scriptEntry.getdObject("instant").debug() : "") + (scriptEntry.hasObject("script") ? scriptEntry.getObjectTag("script").debug() : scriptEntry.getScript().debug()) + + (scriptEntry.hasObject("instant") ? scriptEntry.getObjectTag("instant").debug() : "") + (scriptEntry.hasObject("path") ? scriptEntry.getElement("path").debug() : "") + (scriptEntry.hasObject("local") ? scriptEntry.getElement("local").debug() : "")); } // Get the script - ScriptTag script = scriptEntry.getdObject("script"); + ScriptTag script = scriptEntry.getObjectTag("script"); // Get the entries List entries; diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunCommand.java index 3537ed29..ff6741bf 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunCommand.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunCommand.java @@ -136,18 +136,18 @@ public void execute(ScriptEntry scriptEntry) { if (scriptEntry.dbCallShouldDebug()) { Debug.report(scriptEntry, getName(), - (scriptEntry.hasObject("script") ? scriptEntry.getdObject("script").debug() : scriptEntry.getScript().debug()) - + (scriptEntry.hasObject("instant") ? scriptEntry.getdObject("instant").debug() : "") + (scriptEntry.hasObject("script") ? scriptEntry.getObjectTag("script").debug() : scriptEntry.getScript().debug()) + + (scriptEntry.hasObject("instant") ? scriptEntry.getObjectTag("instant").debug() : "") + (scriptEntry.hasObject("path") ? scriptEntry.getElement("path").debug() : "") + (scriptEntry.hasObject("local") ? scriptEntry.getElement("local").debug() : "") - + (scriptEntry.hasObject("delay") ? scriptEntry.getdObject("delay").debug() : "") - + (scriptEntry.hasObject("id") ? scriptEntry.getdObject("id").debug() : "") - + (scriptEntry.hasObject("definitions") ? scriptEntry.getdObject("definitions").debug() : "") - + (scriptEntry.hasObject("speed") ? scriptEntry.getdObject("speed").debug() : "")); + + (scriptEntry.hasObject("delay") ? scriptEntry.getObjectTag("delay").debug() : "") + + (scriptEntry.hasObject("id") ? scriptEntry.getObjectTag("id").debug() : "") + + (scriptEntry.hasObject("definitions") ? scriptEntry.getObjectTag("definitions").debug() : "") + + (scriptEntry.hasObject("speed") ? scriptEntry.getObjectTag("speed").debug() : "")); } // Get the script - ScriptTag script = scriptEntry.getdObject("script"); + ScriptTag script = scriptEntry.getObjectTag("script"); // Get the entries List entries; @@ -186,7 +186,7 @@ else if (scriptEntry.hasObject("path") && scriptEntry.getObject("path") != null) else { if (scriptEntry.hasObject("speed")) { - DurationTag speed = scriptEntry.getdObject("speed"); + DurationTag speed = scriptEntry.getObjectTag("speed"); queue = ((TimedQueue) new TimedQueue(id).addEntries(entries)).setSpeed(speed.getTicks()); } else { diff --git a/src/main/java/com/denizenscript/denizencore/tags/core/ContextTagBase.java b/src/main/java/com/denizenscript/denizencore/tags/core/ContextTagBase.java index 4a4e644c..24a6b6fe 100644 --- a/src/main/java/com/denizenscript/denizencore/tags/core/ContextTagBase.java +++ b/src/main/java/com/denizenscript/denizencore/tags/core/ContextTagBase.java @@ -69,7 +69,7 @@ public void savedEntryTags(ReplaceableTagEvent event) { } else { String attrib = CoreUtilities.toLowerCase(attribute.getAttributeWithoutContext(2)); - ObjectTag got = held.getdObject(attrib); + ObjectTag got = held.getObjectTag(attrib); if (got == null) { if (!event.hasAlternative()) { Debug.echoDebug(event.getScriptEntry(), "Missing saved entry object '" + attrib + "'");