Update aH

DenizenScript · Jan 12, 2015 · b6dde0b · b6dde0b
1 parent 504b163
commit b6dde0b
Showing 1 changed file with 14 additions and 61 deletions.
diff --git a/src/main/java/net/aufdemrand/denizencore/objects/aH.java b/src/main/java/net/aufdemrand/denizencore/objects/aH.java
@@ -4,13 +4,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.aufdemrand.denizen.scripts.ScriptRegistry;
-import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.scripts.ScriptRegistry;
+import net.aufdemrand.denizencore.utilities.debugging.dB;
 
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.EntityType;
 
 
 /**
@@ -95,7 +92,7 @@ public Argument(String string) {
             }
             else {
                 has_prefix = true;
-                String[] split = StringUtils.split(string, ":", 2);
+                String[] split = (String[]) CoreUtilities.split(string, ':', 2).toArray();
                 prefix = split[0];
                 lower_prefix = CoreUtilities.toLowerCase(prefix);
                 if (split.length == 2)
@@ -132,7 +129,7 @@ public Argument getPrefix() {
 
         // TODO: REMOVE IN 1.0
         public boolean matches(String values) {
-            for (String value : StringUtils.split(values, ',')) {
+            for (String value : CoreUtilities.split(values, ',')) {
                 if (CoreUtilities.toLowerCase(value.trim()).equals(lower_value))
                     return true;
             }
@@ -185,7 +182,7 @@ public boolean matchesEnumList(Enum<?>[] values) {
         // TODO: REMOVE IN 1.0
         public boolean matchesPrefix(String values) {
             if (!hasPrefix()) return false;
-            for (String value : StringUtils.split(values, ',')) {
+            for (String value : CoreUtilities.split(values, ',')) {
                 if (CoreUtilities.toLowerCase(value.trim()).equals(lower_prefix))
                     return true;
             }
@@ -332,7 +329,7 @@ public static String[] buildArgs(String stringArgs) {
         }
 
         if (dB.showScriptBuilder)
-            dB.log(ChatColor.GRAY + "Constructed args: " + Arrays.toString(matchList.toArray()));
+            dB.log("Constructed args: " + Arrays.toString(matchList.toArray()));
 
         return matchList.toArray(new String[matchList.size()]);
     }
@@ -498,13 +495,14 @@ public static boolean matchesValueArg(String names, String string_arg, ArgumentT
             case Boolean:
                 return booleanPrimitive.matcher(string_arg).matches();
 
-            case Location:
-                return dLocation.matches(string_arg);
-
             case Script:
                 // return dScript.matches(string_arg);
                 return true;
 
+            /** TODO: MOVE OUT OF CORE:
+            case Location:
+                return dLocation.matches(string_arg);
+
             case Item:
                 return dItem.matches(string_arg);
 
@@ -513,13 +511,16 @@ public static boolean matchesValueArg(String names, String string_arg, ArgumentT
 
             case Duration:
                 return Duration.matches(string_arg);
-
+*/
             case String:
                 return true;
 
             case Custom:
                 return true;
 
+            default:
+                dB.echoError("Invalid or temporarily unavailable matches value!");
+
         }
 
         dB.echoError("While parsing '" + string_arg + "', Denizen has run into a problem. While the " +
@@ -541,22 +542,6 @@ public static double getDoubleFrom(String arg) {
         }
     }
 
-    @Deprecated
-    public static EntityType getEntityTypeFrom(String arg) {
-        for (EntityType validEntity : EntityType.values())
-            if (getStringFrom(arg).equalsIgnoreCase(validEntity.name()))
-                return validEntity;
-
-        // No match
-        return null;
-    }
-
-    @Deprecated
-    public static dEntity getEntityFrom(String arg) {
-        arg = arg.toLowerCase().replace("entity:", "");
-        return dEntity.valueOf(arg);
-    }
-
     public static float getFloatFrom(String arg) {
         try {
             return Float.valueOf(getStringFrom(arg));
@@ -573,23 +558,11 @@ public static int getIntegerFrom(String arg) {
         }
     }
 
-    @Deprecated
-    public static dItem getItemFrom(String arg) {
-        arg = arg.toLowerCase().replace("item:", "");
-        return dItem.valueOf(arg);
-    }
-
     @Deprecated
     public static dList getListFrom(String arg) {
         return dList.valueOf(aH.getStringFrom(arg));
     }
 
-    @Deprecated
-    public static dLocation getLocationFrom(String arg) {
-        arg = arg.toLowerCase().replace("location:", "");
-        return dLocation.valueOf(arg);
-    }
-
     public static long getLongFrom(String arg) {
         try {
             return Long.valueOf(getStringFrom(arg));
@@ -604,16 +577,6 @@ public static dScript getScriptFrom(String arg) {
         return dScript.valueOf(arg);
     }
 
-    @Deprecated
-    public static dPlayer getPlayerFrom(String arg) {
-        return dPlayer.valueOf(aH.getStringFrom(arg));
-    }
-
-    @Deprecated
-    public static dNPC getNPCFrom(String arg) {
-        return dNPC.valueOf(aH.getStringFrom(arg));
-    }
-
     public static String getStringFrom(String arg) {
         String[] parts = arg.split(":", 2);
         return parts.length >=2 ? parts[1] : arg;
@@ -635,16 +598,6 @@ public static boolean matchesDuration(String arg) {
         return Duration.matches(arg);
     }
 
-    public static boolean matchesEntityType(String arg) {
-        arg = arg.toLowerCase().replace("entity:", "");
-
-        // Check against valid EntityTypes using Bukkit's EntityType enum
-        for (EntityType validEntity : EntityType.values())
-            if (arg.equalsIgnoreCase(validEntity.name()))
-                return true;
-        return false;
-    }
-
     public static boolean matchesInteger(String arg) {
         return integerPrimitive.matcher(arg).matches();
     }