add more context awareness to core systems

DenizenScript · Feb 6, 2019 · 8c006b6 · 8c006b6
1 parent cf89590
commit 8c006b6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizencore/objects/Element.java b/src/main/java/net/aufdemrand/denizencore/objects/Element.java
@@ -280,6 +280,10 @@ public <T extends dObject> T asType(Class<T> dClass) {
         return ObjectFetcher.getObjectFrom(dClass, element);
     }
 
+    public <T extends dObject> T asType(Class<T> dClass, TagContext context) {
+        return ObjectFetcher.getObjectFrom(dClass, element, context);
+    }
+
     public boolean matchesEnum(Enum[] values) {
         for (Enum value : values) {
             if (value.name().equalsIgnoreCase(element)) {

diff --git a/src/main/java/net/aufdemrand/denizencore/objects/Mechanism.java b/src/main/java/net/aufdemrand/denizencore/objects/Mechanism.java
@@ -44,6 +44,10 @@ public Element getValue() {
         return value;
     }
 
+    public <T extends dObject> T valueAsType(Class<T> dClass) {
+        return ObjectFetcher.getObjectFrom(dClass, getValue().asString(), context);
+    }
+
     public boolean hasValue() {
         return value != null;
     }

diff --git a/src/main/java/net/aufdemrand/denizencore/objects/aH.java b/src/main/java/net/aufdemrand/denizencore/objects/aH.java
@@ -1,6 +1,7 @@
 package net.aufdemrand.denizencore.objects;
 
 import net.aufdemrand.denizencore.DenizenCore;
+import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.ScriptRegistry;
 import net.aufdemrand.denizencore.tags.TagManager;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
@@ -89,6 +90,8 @@ public Argument clone() {
         public boolean needsFill = false;
         public boolean hasSpecialPrefix = false;
 
+        public ScriptEntry scriptEntry = null;
+
         public String generateRaw() {
             return prefix == null ? value : prefix + ":" + value;
         }
@@ -397,7 +400,7 @@ public Element asElement() {
 
 
         public <T extends dObject> T asType(Class<T> clazz) {
-            T arg = CoreUtilities.asType(object, clazz, DenizenCore.getImplementation().getTagContext(null));
+            T arg = CoreUtilities.asType(object, clazz, DenizenCore.getImplementation().getTagContext(scriptEntry));
             if (arg != null) {
                 arg.setPrefix(prefix);
                 return arg;

diff --git a/src/main/java/net/aufdemrand/denizencore/scripts/ScriptEntry.java b/src/main/java/net/aufdemrand/denizencore/scripts/ScriptEntry.java
@@ -111,6 +111,7 @@ public void generateAHArgs() {
         }
         for (int i : internal.processArgs) {
             Argument arg = internal.args_ref.get(i);
+            arg.aHArg.scriptEntry = this;
             aHArgs.set(i, arg.aHArg.needsFill || arg.aHArg.hasSpecialPrefix || (internal.hasOldDefs && arg.aHArg.raw_value.indexOf('%') != -1) ? arg.aHArg.clone() : arg.aHArg);
         }
     }