work towards 0.9 Denizen -- object/tag/argument update.

DenizenScript · May 20, 2013 · 03bbbb3 · 03bbbb3
1 parent 07287f5
commit 03bbbb3
Show file tree

Hide file tree

Showing 131 changed files with 509 additions and 402 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/CommandHandler.java b/src/main/java/net/aufdemrand/denizen/CommandHandler.java
@@ -12,8 +12,8 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.ScriptRepo;
 import net.aufdemrand.denizen.utilities.Utilities;
-import net.aufdemrand.denizen.utilities.arguments.dLocation;
-import net.aufdemrand.denizen.utilities.arguments.aH;
+import net.aufdemrand.denizen.arguments.dLocation;
+import net.aufdemrand.denizen.arguments.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.command.Command;

diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -20,7 +20,7 @@
 import net.aufdemrand.denizen.scripts.triggers.TriggerRegistry;
 import net.aufdemrand.denizen.tags.TagManager;
 import net.aufdemrand.denizen.utilities.RuntimeCompiler;
-import net.aufdemrand.denizen.utilities.arguments.dLocation;
+import net.aufdemrand.denizen.arguments.dLocation;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.debugging.dB.DebugElement;
 import net.aufdemrand.denizen.utilities.depends.Depends;

diff --git a/src/main/java/net/aufdemrand/denizen/Settings.java b/src/main/java/net/aufdemrand/denizen/Settings.java
@@ -1,7 +1,7 @@
 package net.aufdemrand.denizen;
 
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizen.utilities.arguments.Duration;
+import net.aufdemrand.denizen.arguments.Duration;
 
 public class Settings {
 

diff --git a/...denizen/utilities/arguments/Duration.java → ...ufdemrand/denizen/arguments/Duration.java b/...denizen/utilities/arguments/Duration.java → ...ufdemrand/denizen/arguments/Duration.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.utilities.arguments;
+package net.aufdemrand.denizen.arguments;
 
 import com.google.common.primitives.Ints;
 import net.aufdemrand.denizen.interfaces.dScriptArgument;
@@ -207,8 +207,7 @@ else return new Element(seconds + "s")
                         .getAttribute(attribute.fulfill(1));
         }
 
-        return new Element(dScriptArgValue())
-                .getAttribute(attribute);
+        return new Element(identify()).getAttribute(attribute.fulfill(0));
     }
 
 

diff --git a/.../denizen/utilities/arguments/Element.java → ...aufdemrand/denizen/arguments/Element.java b/.../denizen/utilities/arguments/Element.java → ...aufdemrand/denizen/arguments/Element.java
@@ -1,14 +1,12 @@
-package net.aufdemrand.denizen.utilities.arguments;
+package net.aufdemrand.denizen.arguments;
 
 import net.aufdemrand.denizen.interfaces.dScriptArgument;
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
-import org.bukkit.util.StringUtil;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 
 public class Element implements dScriptArgument {
@@ -19,8 +17,8 @@ public class Element implements dScriptArgument {
      * @return  a dScript dList
      *
      */
-    @ObjectFetcher("l")
-    public static Element valueOf(String string) {
+    @ObjectFetcher("el")
+    public static dScriptArgument valueOf(String string) {
         if (string == null) return null;
 
         String prefix = null;
@@ -33,7 +31,9 @@ public static Element valueOf(String string) {
         return new Element(prefix, string);
     }
 
-    private String prefix;
+
+
+
     private String element;
 
     public Element(String string) {
@@ -47,19 +47,39 @@ public Element(String prefix, String string) {
         this.element = string;
     }
 
-    @Override
-    public String getDefaultPrefix() {
-        return prefix;
+    public double asDouble() {
+        return Double.valueOf(element);
+    }
+
+    public float asFloat() {
+        return Float.valueOf(element);
     }
 
+    public int asInt() {
+        return Integer.valueOf(element);
+    }
+
+    public boolean asBoolean() {
+        return Boolean.valueOf(element);
+    }
+
+    public String asString() {
+        return element;
+    }
+
+
+
+
+    private String prefix;
+
     @Override
-    public String debug() {
-        return (prefix + "='<A>" + element + "<G>'  ");
+    public String getType() {
+        return "element";
     }
 
     @Override
-    public String as_dScriptArg() {
-        return prefix + ":" + element;
+    public String getPrefix() {
+        return prefix;
     }
 
     @Override
@@ -68,6 +88,21 @@ public dScriptArgument setPrefix(String prefix) {
         return this;
     }
 
+    @Override
+    public String debug() {
+        return (prefix + "='<A>" + identify() + "<G>'  ");
+    }
+
+    @Override
+    public String identify() {
+        return element;
+    }
+
+    @Override
+    public boolean isUnique() {
+        return false;
+    }
+
     @Override
     public String getAttribute(Attribute attribute) {
 
@@ -110,7 +145,7 @@ public String getAttribute(Attribute attribute) {
 
         if (attribute.startsWith("aslist")
                 || attribute.startsWith("as_list"))
-            return new dList("List", element).getAttribute(attribute.fulfill(1));
+            return new dList(element).getAttribute(attribute.fulfill(1));
 
         if (attribute.startsWith("substring")) {            // substring[2,8]
             int beginning_index = Integer.valueOf(attribute.getContext(1).split(",")[0]) - 1;
@@ -122,6 +157,22 @@ public String getAttribute(Attribute attribute) {
         if (attribute.startsWith("last_color"))
             return new Element(String.valueOf(ChatColor.getLastColors(element))).getAttribute(attribute.fulfill(1));
 
+        if (attribute.startsWith("split") && attribute.startsWith("limit", 2)) {
+            String split_string = (attribute.hasContext(1) ? attribute.getContext(1) : " ");
+            Integer limit = (attribute.hasContext(2) ? attribute.getIntContext(2) : 1);
+            if (split_string.toUpperCase().startsWith("regex:"))
+                return new dList(Arrays.asList(element.split(split_string.split(":", 2)[1], limit))).getAttribute(attribute.fulfill(1));
+            else
+                return new dList(Arrays.asList(StringUtils.split(element, split_string, limit))).getAttribute(attribute.fulfill(1));        }
+
+        if (attribute.startsWith("split")) {
+            String split_string = (attribute.hasContext(1) ? attribute.getContext(1) : " ");
+            if (split_string.toUpperCase().startsWith("regex:"))
+                return new dList(Arrays.asList(element.split(split_string.split(":", 2)[1]))).getAttribute(attribute.fulfill(1));
+            else
+                return new dList(Arrays.asList(StringUtils.split(element, split_string))).getAttribute(attribute.fulfill(1));
+        }
+
         if (attribute.startsWith("prefix"))
             return new Element(prefix)
                     .getAttribute(attribute.fulfill(1));
@@ -142,22 +193,6 @@ public String getAttribute(Attribute attribute) {
                     .getAttribute(attribute.fulfill(1));
         }
 
-        if (attribute.startsWith("split") && attribute.startsWith("limit", 2)) {
-            String split_string = (attribute.hasContext(1) ? attribute.getContext(1) : " ");
-            Integer limit = (attribute.hasContext(2) ? attribute.getIntContext(2) : 1);
-            if (split_string.toUpperCase().startsWith("regex:"))
-                return new dList(Arrays.asList(element.split(split_string.split(":", 2)[1], limit))).getAttribute(attribute.fulfill(1));
-            else
-                return new dList(Arrays.asList(StringUtils.split(element, split_string, limit))).getAttribute(attribute.fulfill(1));        }
-
-        if (attribute.startsWith("split")) {
-            String split_string = (attribute.hasContext(1) ? attribute.getContext(1) : " ");
-            if (split_string.toUpperCase().startsWith("regex:"))
-                return new dList(Arrays.asList(element.split(split_string.split(":", 2)[1]))).getAttribute(attribute.fulfill(1));
-            else
-                return new dList(Arrays.asList(StringUtils.split(element, split_string))).getAttribute(attribute.fulfill(1));
-        }
-
         return element;
     }
 

diff --git a/...en/utilities/arguments/ObjectFetcher.java → ...rand/denizen/arguments/ObjectFetcher.java b/...en/utilities/arguments/ObjectFetcher.java → ...rand/denizen/arguments/ObjectFetcher.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.utilities.arguments;
+package net.aufdemrand.denizen.arguments;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...d/denizen/utilities/arguments/Script.java → .../aufdemrand/denizen/arguments/Script.java b/...d/denizen/utilities/arguments/Script.java → .../aufdemrand/denizen/arguments/Script.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.utilities.arguments;
+package net.aufdemrand.denizen.arguments;
 
 import net.aufdemrand.denizen.interfaces.dScriptArgument;
 import net.aufdemrand.denizen.scripts.ScriptRegistry;
@@ -114,7 +114,8 @@ public dScriptArgument setPrefix(String prefix) {
     @Override
     public String getAttribute(Attribute attribute) {
         if (attribute == null) return as_dScriptArg();
-        return null;
+
+        return new Element(identify()).getAttribute(attribute.fulfill(0));
     }