Add <proc.context_map> tag #109
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,93 @@ | ||
| package com.denizenscript.denizencore.tags.core; | ||
|
|
||
| import com.denizenscript.denizencore.objects.ObjectTag; | ||
| import com.denizenscript.denizencore.objects.core.*; | ||
| import com.denizenscript.denizencore.scripts.queues.ScriptQueue; | ||
| import com.denizenscript.denizencore.scripts.containers.core.ProcedureScriptContainer; | ||
| import com.denizenscript.denizencore.utilities.CoreUtilities; | ||
| import com.denizenscript.denizencore.utilities.ScriptUtilities; | ||
| import com.denizenscript.denizencore.tags.TagManager; | ||
| import com.denizenscript.denizencore.utilities.text.StringHolder; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| public class ProcedureScriptTagBase { | ||
|
|
||
| public ProcedureScriptTagBase() { | ||
|
|
||
| // <--[tag] | ||
| // @attribute <proc[<procedure_script_name>]> | ||
| // @returns ObjectTag | ||
| // @description | ||
| // Returns the 'determine' result of a procedure script. | ||
| // --> | ||
| TagManager.registerTagHandler(ObjectTag.class, ElementTag.class, "proc", (attribute, object) -> { | ||
| ScriptTag script; | ||
| String path = null; | ||
| if (object.asString().indexOf('.') > 0) { | ||
| String[] split = attribute.getParam().split("\\.", 2); | ||
| path = split[1]; | ||
| script = ScriptTag.valueOf(split[0], attribute.context); | ||
| } | ||
| else { | ||
| script = attribute.paramAsType(ScriptTag.class); | ||
| } | ||
| if (script == null) { | ||
| attribute.echoError("Missing script for procedure script tag '" + attribute.getParam() + "'!"); | ||
| return null; | ||
| } | ||
| if (!(script.getContainer() instanceof ProcedureScriptContainer)) { | ||
| attribute.echoError("Chosen script is not a procedure script!"); | ||
| return null; | ||
| } | ||
| ListTag definitions = null; | ||
| MapTag mappedDefinitions; | ||
|
|
||
| // <--[tag] | ||
| // @attribute <proc[<procedure_script_name>].context[<object>|...]> | ||
| // @returns ObjectTag | ||
| // @description | ||
| // Returns the 'determine' result of a procedure script with the given context. | ||
| // --> | ||
| if (attribute.startsWith("context", 2)) { | ||
| mappedDefinitions = null; | ||
| definitions = attribute.contextAsType(2, ListTag.class); | ||
| attribute.fulfill(1); | ||
| } | ||
|
|
||
| // <--[tag] | ||
| // @attribute <proc[<procedure_script_name>].context_map[<map>]> | ||
| // @returns ObjectTag | ||
| // @description | ||
| // Returns the 'determine' result of a procedure script with the given context. | ||
| // --> | ||
| else if (attribute.startsWith("context_map", 2)) { | ||
| mappedDefinitions = attribute.contextAsType(2, MapTag.class); | ||
| attribute.fulfill(1); | ||
| } else { | ||
|
|
||
| mappedDefinitions = null; | ||
mcmonkey4eva marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| ScriptQueue queue = ScriptUtilities.createAndStartQueue(script.getContainer(), path, attribute.context.getScriptEntryData(), null, (q) -> { | ||
| if (mappedDefinitions != null) { | ||
| for (Map.Entry<StringHolder, ObjectTag> val : mappedDefinitions.entrySet()) { | ||
| q.addDefinition(val.getKey().str, val.getValue()); | ||
| } | ||
| } | ||
| q.procedural = true; | ||
| }, new DurationTag(0), null, definitions, script.getContainer()); | ||
|
|
||
|
|
||
| if (queue == null) { | ||
| attribute.echoError("Procedure queue start failed."); | ||
| return null; | ||
| } | ||
| attribute.fulfill(1); | ||
|
There was a problem hiding this comment. I don't think it's valid to leave this here. Test |
||
| if (queue.determinations == null || queue.determinations.isEmpty()) { | ||
| attribute.echoError("Procedure call did not determine any value."); | ||
| return null; | ||
| } | ||
| return CoreUtilities.autoAttribTyped(queue.determinations.getObject(0), attribute); | ||
|
There was a problem hiding this comment. this is definitely not right, see above re testing subtags |
||
| }); | ||
|
|
||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be registered with the param input format, rather than using legacy
getParam()callsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, wait, it is, you just labeled it
objectand didn't use it in all callsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please fix the name of the param var