diff --git a/src/main/java/net/aufdemrand/denizen/CommandHandler.java b/src/main/java/net/aufdemrand/denizen/CommandHandler.java index 6048689d82..47282839cb 100644 --- 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 index 18a4c0b22f..04e9f1e0ea 100644 --- 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 index 84bb037873..76dc540357 100644 --- 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/src/main/java/net/aufdemrand/denizen/utilities/arguments/Duration.java b/src/main/java/net/aufdemrand/denizen/arguments/Duration.java similarity index 97% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/Duration.java rename to src/main/java/net/aufdemrand/denizen/arguments/Duration.java index ed8c3d6568..ea65b62dd8 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/Duration.java +++ b/src/main/java/net/aufdemrand/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/src/main/java/net/aufdemrand/denizen/utilities/arguments/Element.java b/src/main/java/net/aufdemrand/denizen/arguments/Element.java similarity index 86% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/Element.java rename to src/main/java/net/aufdemrand/denizen/arguments/Element.java index 14be136786..047e167cd7 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/Element.java +++ b/src/main/java/net/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 + "='" + element + "' "); + 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 + "='" + identify() + "' "); + } + + @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/src/main/java/net/aufdemrand/denizen/utilities/arguments/ObjectFetcher.java b/src/main/java/net/aufdemrand/denizen/arguments/ObjectFetcher.java similarity index 81% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/ObjectFetcher.java rename to src/main/java/net/aufdemrand/denizen/arguments/ObjectFetcher.java index 533a2e4e39..057606dbd5 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/ObjectFetcher.java +++ b/src/main/java/net/aufdemrand/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/src/main/java/net/aufdemrand/denizen/utilities/arguments/Script.java b/src/main/java/net/aufdemrand/denizen/arguments/Script.java similarity index 93% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/Script.java rename to src/main/java/net/aufdemrand/denizen/arguments/Script.java index a54ebd261e..7e0aa10cd6 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/Script.java +++ b/src/main/java/net/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)); } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/aH.java b/src/main/java/net/aufdemrand/denizen/arguments/aH.java similarity index 88% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/aH.java rename to src/main/java/net/aufdemrand/denizen/arguments/aH.java index ae8ffd8bb2..3bcde8f29a 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/aH.java +++ b/src/main/java/net/aufdemrand/denizen/arguments/aH.java @@ -1,6 +1,6 @@ -package net.aufdemrand.denizen.utilities.arguments; +package net.aufdemrand.denizen.arguments; -import net.aufdemrand.denizen.Denizen; +import net.aufdemrand.denizen.interfaces.dScriptArgument; import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.ScriptRegistry; @@ -9,16 +9,17 @@ import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; -import net.minecraft.server.v1_5_R2.Entity; +import net.minecraft.server.v1_5_R3.Entity; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_5_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R3.CraftWorld; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -32,21 +33,6 @@ */ public class aH { - public enum ArgumentType { - LivingEntity, - Item, - Boolean, - Custom, - Double, - Float, - Integer, - String, - Word, - Location, - Script, - Duration - } - /** * To be used with the dBuggers' .report to provide debug output for * objects. @@ -75,29 +61,158 @@ public static String debugUniqueObj(String prefix, String id, Object value) { return "" + prefix + "='" + id + "(" + value.toString() + ")' "; } - private static class Argument { + public enum PrimitiveType { Float, Double, Integer, Boolean, String, Word} + + final static Pattern floatPrimitive = Pattern.compile("^[-+]?[0-9]+[.]?[0-9]*([eE][-+]?[0-9]+)?$"); + final static Pattern doublePrimitive = Pattern.compile("(-)?(?:(?:\\d+)|)(?:(?:\\.\\d+)|)"); + final static Pattern integerPrimitive = Pattern.compile("(-)?\\d+"); + final static Pattern booleanPrimitive = Pattern.compile("true|false", Pattern.CASE_INSENSITIVE); + final static Pattern wordPrimitive = Pattern.compile("\\w+"); + + public static class Argument { String raw_value; String prefix; String value; - ArgumentType argument_type; - Object argument_object; + // Construction public Argument(String string) { raw_value = string; - string = string.trim(); + int first_colon = string.indexOf(":"); int first_space = string.indexOf(" "); + if (first_space < first_colon) value = string; else { + prefix = string.split(":")[0]; + value = string.split(":")[1]; + } + } + + public boolean matchesEnum(Enum[] values) { + for (Enum value : values) + if (value.name().replace("_", "").equalsIgnoreCase(this.value.replace("_", ""))) + return true; + + return false; + } + + public boolean matchesPrefix(String values) { + for (String value : values.split(",")) + if (value.trim().equalsIgnoreCase((prefix != null ? prefix : "null"))) + return true; + + return false; + } + + public boolean matchesPrimitive(PrimitiveType argumentType) { + if (value == null) return false; + + switch (argumentType) { + case Word: + return wordPrimitive.matcher(value).matches(); + + case Integer: + return integerPrimitive.matcher(value).matches(); + + case Double: + return doublePrimitive.matcher(value).matches(); + + case Float: + return floatPrimitive.matcher(value).matches(); + + case Boolean: + return booleanPrimitive.matcher(value).matches(); + + case String: + return true; + } + + return false; + } + + public boolean matchesArgumentType(Class clazz) { + + try { + return (Boolean) clazz.getMethod("matches", Boolean.class).invoke(null, value); + } catch (Exception e) { + e.printStackTrace(); + } + + return false; + } + + public Element asElement() { + return new Element(prefix, value); + } + + public T asType(Class clazz) { + dScriptArgument arg = null; + try { + arg = (dScriptArgument) clazz.getMethod("valueOf", dScriptArgument.class) + .invoke(null, value); + return (T) clazz.cast(arg).setPrefix(prefix); + + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } + + return null; } } - public static Argument interpret(String arg) { - // Trim leading/trailing whitespace - return new Argument(arg); + + public static List interpret(List args) { + List arg_list = new ArrayList(); + for (String string : args) + arg_list.add(new Argument(string.trim())); + return arg_list; + } + + + + + + + + + + + + + + + + + + + + + + + + // OLD SKOOL METHODS + + + public enum ArgumentType { + LivingEntity, + Item, + Boolean, + Custom, + Double, + Float, + Integer, + String, + Word, + Location, + Script, + Duration } @@ -316,9 +431,9 @@ public static double getDoubleFrom(String arg) { * */ public static EntityType getEntityFrom(String arg) { - for (EntityType validEntity : EntityType.values()) - if (getStringFrom(arg).equalsIgnoreCase(validEntity.name())) - return validEntity; + for (EntityType validEntity : EntityType.values()) + if (getStringFrom(arg).equalsIgnoreCase(validEntity.name())) + return validEntity; // No match return null; } @@ -345,7 +460,7 @@ public static LivingEntity getLivingEntityFrom(String arg) { } else if (entityGroupUpper.startsWith("NPC.") - || entityGroupUpper.startsWith("NPCID.") + || entityGroupUpper.startsWith("NPCID.") || entityGroupUpper.startsWith("n@")) { LivingEntity returnable = CitizensAPI.getNPCRegistry().getById(Integer.valueOf(entityGroup.split("\\.")[1])).getBukkitEntity(); if (returnable != null) return returnable; @@ -401,7 +516,7 @@ public static float getFloatFrom(String arg) { */ public static int getIntegerFrom(String arg) { try { - return Integer.valueOf(getValuePart(arg)); + return Integer.valueOf(getValuePart(arg)); } catch (NumberFormatException e) { return 0; } @@ -593,7 +708,7 @@ public static dNPC getdNPCFrom(String arg) { * */ public static OfflinePlayer getOfflinePlayerFrom(String arg) { - arg = getValuePart(arg); + arg = getValuePart(arg); for (OfflinePlayer player : Bukkit.getOfflinePlayers()) if (player.getName().equalsIgnoreCase(arg)) return player; dB.echoError("OfflinePlayer '" + arg + "' is invalid, or has never logged in to this server."); @@ -638,7 +753,7 @@ private static String getValuePart(String arg) { String[] parts = arg.split(":", 2); return parts.length >=2 ? parts[1] : arg; } - + /** *

Gets a Duration object from the dScript duration value format. Accepts a prefix in the * argument for convenience.

@@ -798,7 +913,7 @@ public static boolean matchesInteger(String arg) { */ public static boolean matchesItem(String arg) { if (arg.length() > 5 && arg.toUpperCase().startsWith("ITEM:")) - return true; + return true; // TODO: Other matches____ do some actual checks. return false; } @@ -971,7 +1086,7 @@ else if (arg.toUpperCase().startsWith("toggle:")) final private static Pattern regex = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'"); final static Pattern matchesTogglePtrn = Pattern.compile("toggle:(?:(?:true)|(?:false)|(?:toggle))", Pattern.CASE_INSENSITIVE); final static Pattern matchesScriptPtrn = Pattern.compile("script:(.+)", Pattern.CASE_INSENSITIVE); - + /** * Builds an arguments array, recognizing items in quotes as a single item * diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dEntity.java b/src/main/java/net/aufdemrand/denizen/arguments/dEntity.java similarity index 98% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/dEntity.java rename to src/main/java/net/aufdemrand/denizen/arguments/dEntity.java index c55407958a..9f78c5e59a 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dEntity.java +++ b/src/main/java/net/aufdemrand/denizen/arguments/dEntity.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; @@ -7,16 +7,15 @@ import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.nbt.CustomNBT; import net.citizensnpcs.api.CitizensAPI; -import net.minecraft.server.v1_5_R2.Entity; +import net.minecraft.server.v1_5_R3.Entity; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_5_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R3.CraftWorld; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.ItemStack; import java.util.HashMap; @@ -84,7 +83,7 @@ public static void remove(String id) { * @return a dEntity, or null */ @ObjectFetcher("e") - public static dEntity valueOf(String string) { + public static dScriptArgument valueOf(String string) { if (string == null) return null; /////// @@ -278,7 +277,7 @@ public DespawnedEntity(dEntity entity) { @Override public String getType() { - return "entity"; + return "dEntity"; } @Override @@ -466,7 +465,7 @@ else if ((float) entity.getHealth() / maxHealth < 1) .getAttribute(attribute.fulfill(1)); } - return identify(); + return new Element(identify()).getAttribute(attribute.fulfill(0)); } } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dItem.java b/src/main/java/net/aufdemrand/denizen/arguments/dItem.java similarity index 99% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/dItem.java rename to src/main/java/net/aufdemrand/denizen/arguments/dItem.java index 4e66914f56..b4401f7979 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dItem.java +++ b/src/main/java/net/aufdemrand/denizen/arguments/dItem.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; @@ -71,7 +71,7 @@ public static void remove(String id) { * */ @ObjectFetcher("i") - public static dItem valueOf(String string) { + public static dScriptArgument valueOf(String string) { if (string == null) return null; Matcher m; @@ -339,7 +339,7 @@ public dItem rememberAs(String id) { @Override public String getType() { - return "item"; + return "dItem"; } @Override @@ -492,7 +492,7 @@ public String getAttribute(Attribute attribute) { .getAttribute(attribute.fulfill(1)); - return new Element(identify()).getAttribute(attribute.fulfill(1)); + return new Element(identify()).getAttribute(attribute.fulfill(0)); } } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dList.java b/src/main/java/net/aufdemrand/denizen/arguments/dList.java similarity index 95% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/dList.java rename to src/main/java/net/aufdemrand/denizen/arguments/dList.java index 3b38efcc4d..d3379338ee 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dList.java +++ b/src/main/java/net/aufdemrand/denizen/arguments/dList.java @@ -1,6 +1,5 @@ -package net.aufdemrand.denizen.utilities.arguments; +package net.aufdemrand.denizen.arguments; -import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.flags.FlagManager; import net.aufdemrand.denizen.interfaces.dScriptArgument; import net.aufdemrand.denizen.tags.Attribute; @@ -17,7 +16,7 @@ public class dList extends ArrayList implements dScriptArgument { @ObjectFetcher("li, fl") - public static dList valueOf(String string) { + public static dScriptArgument valueOf(String string) { if (string == null) return null; /////// @@ -117,7 +116,7 @@ public boolean isUnique() { @Override public String getType() { - return "list"; + return "dList"; } @Override @@ -179,7 +178,7 @@ public String getAttribute(Attribute attribute) { .getAttribute(attribute.fulfill(1)); } - return new Element(toString()).getAttribute(attribute); + return new Element(identify()).getAttribute(attribute.fulfill(0)); } } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dLocation.java b/src/main/java/net/aufdemrand/denizen/arguments/dLocation.java similarity index 94% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/dLocation.java rename to src/main/java/net/aufdemrand/denizen/arguments/dLocation.java index 38a828be1e..41f043c69c 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dLocation.java +++ b/src/main/java/net/aufdemrand/denizen/arguments/dLocation.java @@ -1,10 +1,8 @@ -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.DenizenAPI; -import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; @@ -13,7 +11,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class dLocation extends org.bukkit.Location implements dScriptArgument { @@ -60,7 +57,7 @@ public static void _recallLocations() { List loclist = DenizenAPI.getCurrentInstance().getSaves().getStringList("dScript.Locations"); uniqueObjects.clear(); for (String location : loclist) { - dLocation loc = valueOf(location); + dLocation loc = (dLocation) valueOf(location); // TODO: Finish this } } @@ -91,7 +88,7 @@ public static void _saveLocations() { * @return a Location, or null if incorrectly formatted * */ - public static dLocation valueOf(String string) { + public static dScriptArgument valueOf(String string) { if (string == null) return null; // Strip prefix (ie. location:...) if (string.split(":").length > 1) @@ -175,11 +172,22 @@ public dLocation rememberAs(String id) { String prefix = "Location"; + @Override + public String getType() { + return "dLocation"; + } + @Override public String getPrefix() { return prefix; } + @Override + public dLocation setPrefix(String prefix) { + this.prefix = prefix; + return this; + } + @Override public String debug() { return (isSaved(this) ? "" + prefix + "='" + getSaved(this) + "(" + getX() + "," + getY() @@ -193,35 +201,20 @@ public boolean isUnique() { return false; //To change body of implemented methods use File | Settings | File Templates. } - @Override - public String getType() { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - @Override public String identify() { return null; //To change body of implemented methods use File | Settings | File Templates. } - @Override - public String as_dScriptArgValue() { - return getX() + "," + getY() - + "," + getZ() + "," + getWorld().getName(); - } - @Override public String toString() { - if (isSavedLocation(this) != null) - return "l@" + isSavedLocation(this); + if (isSaved(this)) + return "l@" + getSaved(this); else return "l@" + getX() + "," + getY() + "," + getZ() + "," + getWorld().getName(); } - @Override - public dLocation setPrefix(String prefix) { - this.prefix = prefix; - return this; - } + @Override public String getAttribute(Attribute attribute) { @@ -352,7 +345,7 @@ public String getAttribute(Attribute attribute) { // else if (type.equals("Z")) // event.setReplaced(String.valueOf(fromLocation.getZ())); - return dScriptArgValue(); + return new Element(identify()).getAttribute(attribute.fulfill(0)); } } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dPlayer.java b/src/main/java/net/aufdemrand/denizen/arguments/dPlayer.java similarity index 98% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/dPlayer.java rename to src/main/java/net/aufdemrand/denizen/arguments/dPlayer.java index 86eee8e750..7b269c92f5 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dPlayer.java +++ b/src/main/java/net/aufdemrand/denizen/arguments/dPlayer.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.tags.Attribute; @@ -20,7 +20,7 @@ public class dPlayer implements dScriptArgument { * */ @ObjectFetcher("p") - public static dPlayer valueOf(String string) { + public static dScriptArgument valueOf(String string) { if (string == null) return null; if (string.split(":").length > 1) @@ -404,7 +404,7 @@ else if ((float) getPlayerEntity().getFoodLevel() / maxHunger < 1) .getAttribute(attribute.fulfill(1)); } - return toString(); + return new Element(identify()).getAttribute(attribute.fulfill(0)); } } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dWorld.java b/src/main/java/net/aufdemrand/denizen/arguments/dWorld.java similarity index 97% rename from src/main/java/net/aufdemrand/denizen/utilities/arguments/dWorld.java rename to src/main/java/net/aufdemrand/denizen/arguments/dWorld.java index 9517fa9ef6..a60ffb7aa6 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/arguments/dWorld.java +++ b/src/main/java/net/aufdemrand/denizen/arguments/dWorld.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.tags.Attribute; @@ -182,7 +182,7 @@ public String getAttribute(Attribute attribute) { .getAttribute(attribute.fulfill(1)); } - return dScriptArgValue(); + return new Element(identify()).getAttribute(attribute.fulfill(0)); } } diff --git a/src/main/java/net/aufdemrand/denizen/events/ReplaceableTagEvent.java b/src/main/java/net/aufdemrand/denizen/events/ReplaceableTagEvent.java index 82155eed1e..e01e42867b 100644 --- a/src/main/java/net/aufdemrand/denizen/events/ReplaceableTagEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/ReplaceableTagEvent.java @@ -5,9 +5,8 @@ import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.ScriptEntry; -import net.aufdemrand.denizen.tags.Attribute; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.citizensnpcs.api.CitizensAPI; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/net/aufdemrand/denizen/flags/FlagManager.java b/src/main/java/net/aufdemrand/denizen/flags/FlagManager.java index 38bdeb0b80..61ac67fd3b 100644 --- a/src/main/java/net/aufdemrand/denizen/flags/FlagManager.java +++ b/src/main/java/net/aufdemrand/denizen/flags/FlagManager.java @@ -2,9 +2,8 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.npc.dNPC; -import net.aufdemrand.denizen.scripts.commands.core.FlagCommand; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/net/aufdemrand/denizen/listeners/AbstractListenerType.java b/src/main/java/net/aufdemrand/denizen/listeners/AbstractListenerType.java index edcca14fdd..2df91431eb 100644 --- a/src/main/java/net/aufdemrand/denizen/listeners/AbstractListenerType.java +++ b/src/main/java/net/aufdemrand/denizen/listeners/AbstractListenerType.java @@ -6,7 +6,7 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.interfaces.RegistrationableInstance; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; public abstract class AbstractListenerType implements RegistrationableInstance { diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/BlockListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/BlockListenerInstance.java index 49a6a00e42..9aa8861aee 100644 --- a/src/main/java/net/aufdemrand/denizen/listeners/core/BlockListenerInstance.java +++ b/src/main/java/net/aufdemrand/denizen/listeners/core/BlockListenerInstance.java @@ -16,8 +16,8 @@ import net.aufdemrand.denizen.events.ReplaceableTagEvent; import net.aufdemrand.denizen.listeners.AbstractListener; import net.aufdemrand.denizen.listeners.core.BlockListenerType.BlockType; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.aufdemrand.denizen.utilities.depends.WorldGuardUtilities; diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java index 540183737d..0fd3997d50 100644 --- a/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java +++ b/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.listeners.core; import java.util.List; -import java.util.Random; import org.bukkit.Location; import org.bukkit.Material; @@ -16,8 +15,8 @@ import net.aufdemrand.denizen.listeners.AbstractListener; import net.aufdemrand.denizen.listeners.core.ItemDropListenerType.ItemDropType; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.WorldGuardUtilities; diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/ItemListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/ItemListenerInstance.java index 7fc81cf5cc..756754c49f 100644 --- a/src/main/java/net/aufdemrand/denizen/listeners/core/ItemListenerInstance.java +++ b/src/main/java/net/aufdemrand/denizen/listeners/core/ItemListenerInstance.java @@ -8,8 +8,8 @@ import net.aufdemrand.denizen.listeners.core.ItemListenerType.ItemType; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.aufdemrand.denizen.utilities.depends.WorldGuardUtilities; diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/KillListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/KillListenerInstance.java index 40cc4fe4b7..50a9df093d 100644 --- a/src/main/java/net/aufdemrand/denizen/listeners/core/KillListenerInstance.java +++ b/src/main/java/net/aufdemrand/denizen/listeners/core/KillListenerInstance.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.events.ReplaceableTagEvent; import net.aufdemrand.denizen.listeners.AbstractListener; import net.aufdemrand.denizen.listeners.core.KillListenerType.KillType; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.aufdemrand.denizen.utilities.depends.Depends; diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/TravelListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/TravelListenerInstance.java index 4259a2c472..d2e9868d98 100644 --- a/src/main/java/net/aufdemrand/denizen/listeners/core/TravelListenerInstance.java +++ b/src/main/java/net/aufdemrand/denizen/listeners/core/TravelListenerInstance.java @@ -3,15 +3,15 @@ import java.util.List; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.dLocation; +import net.aufdemrand.denizen.arguments.dLocation; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; import net.aufdemrand.denizen.listeners.AbstractListener; import net.aufdemrand.denizen.listeners.core.TravelListenerType.TravelType; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java b/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java index 50b26cc417..09e4414eb8 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java +++ b/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java @@ -5,7 +5,7 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.containers.core.AssignmentScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.DebugElement; import org.bukkit.entity.Player; diff --git a/src/main/java/net/aufdemrand/denizen/npc/activities/core/TaskActivity.java b/src/main/java/net/aufdemrand/denizen/npc/activities/core/TaskActivity.java index 89d3ab74b9..ea2f910597 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/activities/core/TaskActivity.java +++ b/src/main/java/net/aufdemrand/denizen/npc/activities/core/TaskActivity.java @@ -7,8 +7,8 @@ import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.npc.activities.AbstractActivity; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.ai.Goal; diff --git a/src/main/java/net/aufdemrand/denizen/npc/activities/core/WanderActivity.java b/src/main/java/net/aufdemrand/denizen/npc/activities/core/WanderActivity.java index b5a516652e..7ada21fb3b 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/activities/core/WanderActivity.java +++ b/src/main/java/net/aufdemrand/denizen/npc/activities/core/WanderActivity.java @@ -7,8 +7,8 @@ import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.npc.activities.AbstractActivity; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.ai.event.NavigationCompleteEvent; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/npc/dNPC.java b/src/main/java/net/aufdemrand/denizen/npc/dNPC.java index 5b78cf3bb5..8e510370b9 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/dNPC.java +++ b/src/main/java/net/aufdemrand/denizen/npc/dNPC.java @@ -9,7 +9,7 @@ import net.aufdemrand.denizen.scripts.containers.core.InteractScriptHelper; import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.dLocation; +import net.aufdemrand.denizen.arguments.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.ai.Navigator; diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java index 2f92672ab6..4288dd1fbb 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java +++ b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.Settings; import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.event.DespawnReason; import net.citizensnpcs.api.event.NPCDeathEvent; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptBuilder.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptBuilder.java index 7bdafcd7df..14efa187d8 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/ScriptBuilder.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/ScriptBuilder.java @@ -2,7 +2,7 @@ import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.containers.ScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.entity.Player; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptEntry.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptEntry.java index 4a94e4539b..45ceeff56d 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/ScriptEntry.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/ScriptEntry.java @@ -3,7 +3,7 @@ import net.aufdemrand.denizen.exceptions.ScriptEntryCreationException; import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.containers.ScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.Script; +import net.aufdemrand.denizen.arguments.Script; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptQueue.java index 4f8c6160ef..ead08f0a98 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/ScriptQueue.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/ScriptQueue.java @@ -2,8 +2,7 @@ import net.aufdemrand.denizen.Settings; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.interfaces.dScriptArgument; +import net.aufdemrand.denizen.arguments.Duration; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.Bukkit; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java index f490fe8485..47595bf875 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandExecuter.java @@ -4,11 +4,10 @@ import net.aufdemrand.denizen.events.ScriptEntryExecuteEvent; import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.DebugElement; import net.citizensnpcs.api.CitizensAPI; -import net.citizensnpcs.api.npc.AbstractNPC; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnchorCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnchorCommand.java index a0cc955ec7..bf74a26e99 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnchorCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnchorCommand.java @@ -1,16 +1,19 @@ package net.aufdemrand.denizen.scripts.commands.core; +import net.aufdemrand.denizen.arguments.Element; import net.aufdemrand.denizen.exceptions.CommandExecutionException; import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; 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.trait.Anchors; +import static net.aufdemrand.denizen.arguments.aH.Argument; + /** * * TODO: Document usage @@ -27,80 +30,88 @@ private enum Action { ADD, REMOVE, ASSUME, WALKTO, WALKNEAR } @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - Action action = Action.ADD; - dLocation location = null; - String id = null; - Integer range = null; - // Parse Arguments - for (String arg : scriptEntry.getArguments()) { - if (aH.matchesArg("ADD, WALKTO, WALKNEAR, ASSUME, REMOVE", arg)) { - action = Action.valueOf(aH.getStringFrom(arg).toUpperCase()); + for (Argument arg : aH.interpret(scriptEntry.getArguments())) { + + if (!scriptEntry.hasObject("action") + && arg.matchesEnum(Action.values())) + // add Action + scriptEntry.addObject("action", arg.asElement().setPrefix("action")); + - } else if (aH.matchesValueArg("ID", arg, aH.ArgumentType.String)) { - id = aH.getStringFrom(arg); + else if (!scriptEntry.hasObject("range") + && arg.matchesPrimitive(aH.PrimitiveType.Double) + && arg.matchesPrefix("range, r")) + // add range (for WALKNEAR) + scriptEntry.addObject("range", arg.asElement().setPrefix("range")); - } else if (aH.matchesLocation(arg)) { - location = aH.getLocationFrom(arg); - } else if (aH.matchesValueArg("RANGE", arg, aH.ArgumentType.Integer)) { - range = aH.getIntegerFrom(arg); + else if (!scriptEntry.hasObject("id") + && arg.matchesPrefix("id, i")) + // add anchor ID + scriptEntry.addObject("id", arg.asElement().setPrefix("id")); - } else throw new InvalidArgumentsException(dB.Messages.ERROR_UNKNOWN_ARGUMENT); + else if (!scriptEntry.hasObject("location") + && arg.matchesArgumentType(dLocation.class)) + // add location (for ADD) + scriptEntry.addObject("location", arg.asType(dLocation.class).setPrefix("location")); + + + else throw new InvalidArgumentsException(dB.Messages.ERROR_UNKNOWN_ARGUMENT); } - scriptEntry.addObject("action", action) - .addObject("id", id) - .addObject("range", range) - .addObject("location", location); + + if (!scriptEntry.hasObject("action")) + throw new InvalidArgumentsException("Must specify an 'Anchor Action'."); } @Override public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { + // Get objects - Action action = (Action) scriptEntry.getObject("action"); dLocation location = (dLocation) scriptEntry.getObject("location"); - Integer range = (Integer) scriptEntry.getObject("range"); - String id = (String) scriptEntry.getObject("id"); + Element action = (Element) scriptEntry.getObject("action"); + Element range = (Element) scriptEntry.getObject("range"); + Element id = (Element) scriptEntry.getObject("id"); // Report to dB dB.report(getName(), aH.debugObj("NPC", scriptEntry.getNPC().toString()) - + aH.debugObj("Action", action.toString()) - + aH.debugObj("Id", id) + + action.debug() + id.debug() + (location != null ? location.debug() : "") - + (range != null ? aH.debugObj("Range", range.toString()) : "" )); + + (range != null ? range.debug() : "" )); dNPC npc = scriptEntry.getNPC(); + Action action_ = Action.valueOf(action.toString().replace("_", "").toUpperCase()); - switch (action) { + switch (action_) { case ADD: - npc.getCitizen().getTrait(Anchors.class).addAnchor(id, location); + npc.getCitizen().getTrait(Anchors.class).addAnchor(id.asString(), location); return; case ASSUME: npc.getEntity().teleport(npc.getCitizen().getTrait(Anchors.class) - .getAnchor(id).getLocation()); + .getAnchor(id.asString()).getLocation()); return; case WALKNEAR: npc.getNavigator().setTarget(Utilities .getWalkableLocationNear(npc.getCitizen().getTrait(Anchors.class) - .getAnchor(id).getLocation(), range)); + .getAnchor(id.asString()).getLocation(), range.asInt())); return; case WALKTO: npc.getNavigator().setTarget(npc.getCitizen().getTrait(Anchors.class) - .getAnchor(id).getLocation()); + .getAnchor(id.asString()).getLocation()); return; case REMOVE: npc.getCitizen().getTrait(Anchors.class) .removeAnchor(npc.getCitizen().getTrait(Anchors.class) - .getAnchor(id)); + .getAnchor(id.asString())); return; } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnimateChestCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnimateChestCommand.java index 987b8b9b43..108c0c0b53 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnimateChestCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnimateChestCommand.java @@ -7,8 +7,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; public class AnimateChestCommand extends AbstractCommand { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnnounceCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnnounceCommand.java index 4207306892..efbdfc5233 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnnounceCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AnnounceCommand.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.scripts.containers.core.FormatScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.Bukkit; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AssignmentCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AssignmentCommand.java index 64061c6e92..8ae1e4e589 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AssignmentCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AssignmentCommand.java @@ -5,8 +5,8 @@ import net.aufdemrand.denizen.npc.traits.AssignmentTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AttackCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AttackCommand.java index e835f21a1b..1dcc4516f1 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AttackCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/AttackCommand.java @@ -4,7 +4,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; /** diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CastCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CastCommand.java index da693ff61b..9e1417bfbd 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CastCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CastCommand.java @@ -4,9 +4,9 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChatCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChatCommand.java index dc181a14f0..9cce9989cf 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChatCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChatCommand.java @@ -4,10 +4,9 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.ai.speech.SpeechContext; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChunkLoadCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChunkLoadCommand.java index f78811142f..ef90a28812 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChunkLoadCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChunkLoadCommand.java @@ -7,8 +7,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.event.NPCDespawnEvent; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ClearCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ClearCommand.java index 1fababa3c6..3340ac51fd 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ClearCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ClearCommand.java @@ -5,7 +5,7 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import java.util.ArrayList; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java index b9d1c65c2b..cef629f959 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CooldownCommand.java @@ -5,13 +5,12 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.OfflinePlayer; -import org.bukkit.configuration.file.FileConfiguration; /** *

Sets a 'cooldown' period on a script. Can be per-player or globally.

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CopyBlockCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CopyBlockCommand.java index f37ee53fb5..7781e58465 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CopyBlockCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/CopyBlockCommand.java @@ -4,9 +4,9 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.dLocation; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.dLocation; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.block.Block; import org.bukkit.inventory.InventoryHolder; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DetermineCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DetermineCommand.java index 57b3fb526f..f2d81d1164 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DetermineCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DetermineCommand.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; /** * diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DisengageCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DisengageCommand.java index 57c3ef4f19..003c859e14 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DisengageCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DisengageCommand.java @@ -4,7 +4,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DisplayItemCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DisplayItemCommand.java index 0e4811bab9..c238a3bedb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DisplayItemCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DisplayItemCommand.java @@ -7,10 +7,10 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.dItem; -import net.aufdemrand.denizen.utilities.arguments.dLocation; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.dItem; +import net.aufdemrand.denizen.arguments.dLocation; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DropCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DropCommand.java index 75fc7dacfc..5e60acd735 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DropCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/DropCommand.java @@ -4,9 +4,9 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.dItem; -import net.aufdemrand.denizen.utilities.arguments.dLocation; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.dItem; +import net.aufdemrand.denizen.arguments.dLocation; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.entity.EntityType; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EngageCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EngageCommand.java index 02442cecbe..96bea57a0b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EngageCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EngageCommand.java @@ -5,8 +5,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EngraveCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EngraveCommand.java index 1f5805d0a3..78a4a053e4 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EngraveCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EngraveCommand.java @@ -14,7 +14,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EquipCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EquipCommand.java index 5f0ed606cf..be44dac4a0 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EquipCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/EquipCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.dItem; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.dItem; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ExecuteCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ExecuteCommand.java index ac5f67ec65..b57d52008d 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ExecuteCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ExecuteCommand.java @@ -9,7 +9,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ExperienceCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ExperienceCommand.java index 46297aaf9e..228b0fbf67 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ExperienceCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ExperienceCommand.java @@ -7,8 +7,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java index d04e026191..5c7ed4f4c6 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FailCommand.java @@ -6,8 +6,8 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.Bukkit; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FeedCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FeedCommand.java index a3f6f9dd29..2aefa46b3b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FeedCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FeedCommand.java @@ -8,8 +8,8 @@ import net.aufdemrand.denizen.npc.traits.HungerTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.CitizensAPI; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java index d778f765c3..512181eeef 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FinishCommand.java @@ -6,8 +6,8 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.Bukkit; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FishCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FishCommand.java index 2dd9d3aee5..dacfd5ae77 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FishCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FishCommand.java @@ -5,7 +5,7 @@ import net.aufdemrand.denizen.npc.traits.FishingTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java index d47bcf388e..1821dcbf6c 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java @@ -5,8 +5,8 @@ import net.aufdemrand.denizen.flags.FlagManager.Flag; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FollowCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FollowCommand.java index ace4ec1289..cc000ae44f 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FollowCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FollowCommand.java @@ -4,7 +4,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; /** diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/GiveCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/GiveCommand.java index eace394dfe..3913870518 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/GiveCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/GiveCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.dItem; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.dItem; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizen.utilities.nbt.CustomNBT; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/GroupCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/GroupCommand.java index 947e3d9921..54f75fbbbe 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/GroupCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/GroupCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HealCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HealCommand.java index f34a0d2005..1339cb762f 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HealCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HealCommand.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; -import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import net.aufdemrand.denizen.exceptions.CommandExecutionException; @@ -9,11 +8,10 @@ import net.aufdemrand.denizen.npc.traits.HealthTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; -import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; /** diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HealthCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HealthCommand.java index 64372a9904..82d6511ec5 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HealthCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HealthCommand.java @@ -5,13 +5,11 @@ import net.aufdemrand.denizen.npc.traits.HealthTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; -import net.citizensnpcs.api.npc.NPC; import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; -import org.bukkit.entity.Player; public class HealthCommand extends AbstractCommand { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HurtCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HurtCommand.java index 963287edd0..02b8982323 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HurtCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/HurtCommand.java @@ -5,8 +5,8 @@ import net.aufdemrand.denizen.npc.traits.HealthTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java index c33e371618..0e41ac6401 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java @@ -8,15 +8,12 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.exceptions.ScriptEntryCreationException; import net.aufdemrand.denizen.scripts.ScriptEntry; -import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.scripts.containers.core.TaskScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import org.bukkit.ChatColor; -import org.bukkit.entity.Player; /** * Core dScript IF command. diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InvisibleCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InvisibleCommand.java index 1fcb215945..cb00db58b3 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InvisibleCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InvisibleCommand.java @@ -5,9 +5,8 @@ import net.aufdemrand.denizen.npc.traits.InvisibleTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; -import org.bukkit.potion.PotionEffectType; /** * Instructs the NPC to follow a player. diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ListenCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ListenCommand.java index d824eec05d..ea83e1fa30 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ListenCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ListenCommand.java @@ -7,8 +7,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LookCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LookCommand.java index 98fc2ef9ac..6f34089c8c 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LookCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LookCommand.java @@ -1,21 +1,17 @@ package net.aufdemrand.denizen.scripts.commands.core; -import net.aufdemrand.denizen.npc.dNPC; import org.bukkit.Location; import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; import net.aufdemrand.denizen.exceptions.CommandExecutionException; import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.trait.LookClose; -import net.citizensnpcs.trait.Poses; -import net.citizensnpcs.util.Util; /** * Controls Denizens' heads. diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LookcloseCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LookcloseCommand.java index 23152fb6b9..3fe0d2e3e7 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LookcloseCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/LookcloseCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ModifyBlockCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ModifyBlockCommand.java index e7fd83c7c9..21dd500d03 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ModifyBlockCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ModifyBlockCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NameplateCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NameplateCommand.java index 99f24287fe..5dfc2dee21 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NameplateCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NameplateCommand.java @@ -7,12 +7,11 @@ import java.util.List; import net.aufdemrand.denizen.exceptions.CommandExecutionException; import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; -import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.npc.traits.NameplateTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NarrateCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NarrateCommand.java index 2478d397e2..3833bdd28b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NarrateCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NarrateCommand.java @@ -8,7 +8,7 @@ import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.scripts.containers.core.FormatScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NewCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NewCommand.java index 6efcf01b42..c3dcd1ab0f 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NewCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/NewCommand.java @@ -4,9 +4,9 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.dItem; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.dItem; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.CitizensAPI; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PauseCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PauseCommand.java index b4118ec961..0636d62be9 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PauseCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PauseCommand.java @@ -5,7 +5,7 @@ import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.trait.waypoint.Waypoints; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PermissionCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PermissionCommand.java index 69423f0327..28e26f5ffb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PermissionCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PermissionCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PlaySoundCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PlaySoundCommand.java index 41d5d29993..2d097ee516 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PlaySoundCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PlaySoundCommand.java @@ -7,8 +7,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PoseCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PoseCommand.java index d44eb7047f..5baae79770 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PoseCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/PoseCommand.java @@ -8,8 +8,7 @@ import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.trait.Poses; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java index 601f816550..1a91957dce 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/QueueCommand.java @@ -8,8 +8,8 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java index f1aa2befa8..c7c213f08c 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java @@ -6,7 +6,7 @@ import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RemoveCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RemoveCommand.java index a531e2f95d..0d6d8b1053 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RemoveCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RemoveCommand.java @@ -4,8 +4,6 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.debugging.dB; /** * Safely removes an NPC. diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java index 174acf7ad2..62fe0444cb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ResetCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; public class ResetCommand extends AbstractCommand { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RuntaskCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RuntaskCommand.java index 92b14efe27..616ea90e21 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RuntaskCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RuntaskCommand.java @@ -10,9 +10,9 @@ import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.scripts.containers.core.TaskScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScoreboardCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScoreboardCommand.java index 2e2484fc5b..8100e32ee6 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScoreboardCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScoreboardCommand.java @@ -2,21 +2,16 @@ import net.aufdemrand.denizen.exceptions.CommandExecutionException; import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; -import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizen.utilities.debugging.dB.Messages; -import net.citizensnpcs.trait.Poses; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Scoreboard; -import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScribeCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScribeCommand.java index 3836251c9b..5738957eea 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScribeCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScribeCommand.java @@ -8,8 +8,8 @@ import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.scripts.containers.core.BookScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.dItem; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.dItem; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.Location; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ShootCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ShootCommand.java index 4ee80528f0..cfcb0d079e 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ShootCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ShootCommand.java @@ -7,11 +7,11 @@ import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.scripts.containers.core.TaskScriptContainer; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.dLocation; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.dLocation; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.Color; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SitCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SitCommand.java index bbe2d8c418..c55c4ac272 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SitCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SitCommand.java @@ -1,6 +1,6 @@ package net.aufdemrand.denizen.scripts.commands.core; -import net.aufdemrand.denizen.utilities.arguments.dLocation; +import net.aufdemrand.denizen.arguments.dLocation; import org.bukkit.entity.EntityType; import net.aufdemrand.denizen.exceptions.CommandExecutionException; @@ -8,7 +8,7 @@ import net.aufdemrand.denizen.npc.traits.SittingTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/StrikeCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/StrikeCommand.java index a0b286d9cc..96506d4328 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/StrikeCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/StrikeCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -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.aufdemrand.denizen.utilities.debugging.dB.Messages; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SwitchCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SwitchCommand.java index f39f3cd592..9b3302c5cb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SwitchCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SwitchCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.minecraft.server.v1_5_R2.Block; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TakeCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TakeCommand.java index 8159437090..5906ac7beb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TakeCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TakeCommand.java @@ -6,7 +6,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.aufdemrand.denizen.utilities.depends.Depends; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TeleportCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TeleportCommand.java index 5466ab739d..913519fed7 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TeleportCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TeleportCommand.java @@ -4,10 +4,10 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.dEntity; -import net.aufdemrand.denizen.utilities.arguments.dLocation; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.dEntity; +import net.aufdemrand.denizen.arguments.dLocation; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TriggerCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TriggerCommand.java index fd7c8fb7f6..6fe24e487d 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TriggerCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/TriggerCommand.java @@ -5,9 +5,9 @@ import net.aufdemrand.denizen.npc.traits.TriggerTrait; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/VulnerableCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/VulnerableCommand.java index 91bf4631f2..e7963597fa 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/VulnerableCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/VulnerableCommand.java @@ -4,7 +4,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WaitCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WaitCommand.java index e0c2739489..884b7ef11b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WaitCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WaitCommand.java @@ -5,8 +5,8 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; /** diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WalkToCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WalkToCommand.java index 9eed2bdfc9..6abf65f7de 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WalkToCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WalkToCommand.java @@ -4,8 +4,8 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -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 org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WorldCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WorldCommand.java index b590e3d6f0..ad724ea678 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WorldCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WorldCommand.java @@ -4,7 +4,7 @@ import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java index ca1138528f..32c500d4d4 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java @@ -1,17 +1,14 @@ package net.aufdemrand.denizen.scripts.commands.core; -import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.events.ReplaceableTagEvent; import net.aufdemrand.denizen.exceptions.CommandExecutionException; import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.scripts.containers.core.InteractScriptHelper; import net.aufdemrand.denizen.tags.Attribute; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.*; +import net.aufdemrand.denizen.arguments.*; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; @@ -21,7 +18,6 @@ import java.io.File; import java.io.IOException; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; /** * diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java index b87b964cc6..31be075353 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ZapCommand.java @@ -5,9 +5,9 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.scripts.containers.core.InteractScriptHelper; -import net.aufdemrand.denizen.utilities.arguments.Duration; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Duration; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/ScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/ScriptContainer.java index c96c2904a9..ea028b904f 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/ScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/ScriptContainer.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; import net.aufdemrand.denizen.scripts.requirements.RequirementsMode; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.Script; +import net.aufdemrand.denizen.arguments.Script; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java index 4d5547a592..9703f80cbb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java @@ -3,7 +3,7 @@ import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.containers.ScriptContainer; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.dItem; +import net.aufdemrand.denizen.arguments.dItem; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptContainer.java index d0139ebf07..a7ae2eb273 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptContainer.java @@ -2,7 +2,7 @@ import net.aufdemrand.denizen.npc.dNPC; import net.aufdemrand.denizen.scripts.containers.ScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.dEntity; +import net.aufdemrand.denizen.arguments.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; import net.minecraft.server.v1_5_R2.EntityLiving; import net.minecraft.server.v1_5_R2.NBTTagCompound; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptContainer.java index 40e48fdb17..e5ef08c2d2 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptContainer.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.containers.ScriptContainer; import net.aufdemrand.denizen.tags.TagManager; -import net.aufdemrand.denizen.utilities.arguments.dItem; +import net.aufdemrand.denizen.arguments.dItem; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.nbt.CustomNBT; import net.aufdemrand.denizen.utilities.nbt.LeatherColorer; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/TaskScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/TaskScriptContainer.java index 74a5744206..c3db5fdd77 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/TaskScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/TaskScriptContainer.java @@ -6,7 +6,7 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.containers.ScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.Duration; +import net.aufdemrand.denizen.arguments.Duration; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java index 6a7ff4bda3..31db4faed0 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java @@ -8,10 +8,10 @@ import net.aufdemrand.denizen.scripts.commands.core.DetermineCommand; import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.dItem; -import net.aufdemrand.denizen.utilities.arguments.dLocation; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.dList; +import net.aufdemrand.denizen.arguments.dItem; +import net.aufdemrand.denizen.arguments.dLocation; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.dList; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import org.bukkit.Bukkit; @@ -36,7 +36,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; public class WorldScriptHelper implements Listener { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/RequirementChecker.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/RequirementChecker.java index bce05c2bab..83a8a2f8b4 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/RequirementChecker.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/RequirementChecker.java @@ -2,7 +2,7 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.exceptions.RequirementCheckException; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.ChatColor; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/EnchantedRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/EnchantedRequirement.java index 6da1f81db0..7c52a816ac 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/EnchantedRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/EnchantedRequirement.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import java.util.List; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/FlaggedRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/FlaggedRequirement.java index c7086bec8d..5ae451ac5e 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/FlaggedRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/FlaggedRequirement.java @@ -5,7 +5,7 @@ import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import java.util.List; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/HoldingRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/HoldingRequirement.java index ee017e8cae..98072c339b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/HoldingRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/HoldingRequirement.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.dItem; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.dItem; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import java.util.List; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/InGroupRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/InGroupRequirement.java index 005e077a2f..e6a89dcdcb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/InGroupRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/InGroupRequirement.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ItemRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ItemRequirement.java index 44a9d82855..e14109dcc4 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ItemRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ItemRequirement.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.scripts.containers.core.ItemScriptContainer; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/LiquidRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/LiquidRequirement.java index ee21cdfc5e..e423b7dfcf 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/LiquidRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/LiquidRequirement.java @@ -3,7 +3,7 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.block.Block; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/MoneyRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/MoneyRequirement.java index e4edc79e8f..a91f64dab5 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/MoneyRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/MoneyRequirement.java @@ -3,7 +3,7 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.Messages; import net.aufdemrand.denizen.utilities.depends.Depends; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PermissionRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PermissionRequirement.java index 85490c3628..4e565da072 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PermissionRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PermissionRequirement.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PoweredRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PoweredRequirement.java index 61b235cfcc..c08f581e4a 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PoweredRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/PoweredRequirement.java @@ -3,7 +3,7 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.block.Block; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ScriptRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ScriptRequirement.java index 65c52053a9..3a2488831d 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ScriptRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/ScriptRequirement.java @@ -5,8 +5,8 @@ import net.aufdemrand.denizen.scripts.commands.core.FinishCommand; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import java.util.List; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/TimeRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/TimeRequirement.java index fa51a82f7e..e3502c216c 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/TimeRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/TimeRequirement.java @@ -3,7 +3,7 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import java.util.List; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/WorldGuardRegionRequirement.java b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/WorldGuardRegionRequirement.java index 451a4256e2..df24597334 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/WorldGuardRegionRequirement.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/requirements/core/WorldGuardRegionRequirement.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.exceptions.RequirementCheckException; import net.aufdemrand.denizen.scripts.requirements.AbstractRequirement; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.aH.ArgumentType; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.WorldGuardUtilities; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java index 5625942cc1..367f2b9977 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/AbstractTrigger.java @@ -7,8 +7,6 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.containers.core.InteractScriptContainer; -import net.aufdemrand.denizen.scripts.triggers.TriggerRegistry.CooldownType; -import net.aufdemrand.denizen.utilities.arguments.Duration; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.debugging.dB.DebugElement; import net.citizensnpcs.api.CitizensAPI; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java index e449917864..5d747ef7f3 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java @@ -9,7 +9,7 @@ import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.Bukkit; @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ClickTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ClickTrigger.java index d725ef520f..e55a507c2b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ClickTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ClickTrigger.java @@ -6,7 +6,7 @@ import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.dItem; +import net.aufdemrand.denizen.arguments.dItem; import net.citizensnpcs.api.event.NPCRightClickEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java index 446731567b..aac796a557 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/DamageTrigger.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.dItem; +import net.aufdemrand.denizen.arguments.dItem; import net.citizensnpcs.api.CitizensAPI; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ConstantTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ConstantTags.java index 940e84c88f..75b8c668a5 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/ConstantTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/ConstantTags.java @@ -4,7 +4,7 @@ import net.aufdemrand.denizen.events.ReplaceableTagEvent; import net.aufdemrand.denizen.npc.traits.ConstantsTrait; import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.utilities.arguments.Element; +import net.aufdemrand.denizen.arguments.Element; import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java index 3a0bea31f2..005027f280 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.events.ReplaceableTagEvent; 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 org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java index 25635917b4..1f308a7333 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java @@ -6,7 +6,7 @@ import net.aufdemrand.denizen.npc.traits.AssignmentTrait; import net.aufdemrand.denizen.npc.traits.NicknameTrait; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.arguments.dLocation; +import net.aufdemrand.denizen.arguments.dLocation; import net.citizensnpcs.api.ai.event.NavigationBeginEvent; import net.citizensnpcs.api.ai.event.NavigationCancelEvent; import net.citizensnpcs.api.ai.event.NavigationCompleteEvent; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java index fde157e610..d04512b8cf 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java @@ -3,12 +3,8 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.events.ReplaceableTagEvent; import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.utilities.arguments.dLocation; +import net.aufdemrand.denizen.arguments.dLocation; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.citizensnpcs.api.CitizensAPI; -import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.trait.Anchors; -import org.bukkit.Location; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/OfflinePlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/OfflinePlayerTags.java index 7854bfd966..fdb2357f60 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/OfflinePlayerTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/OfflinePlayerTags.java @@ -2,7 +2,7 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.events.ReplaceableTagEvent; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java index 2981d59d80..e3fbf0f56e 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java @@ -5,7 +5,7 @@ import net.aufdemrand.denizen.scripts.commands.core.FailCommand; import net.aufdemrand.denizen.scripts.commands.core.FinishCommand; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.*; +import net.aufdemrand.denizen.arguments.*; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizen.utilities.nbt.CustomNBT; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java b/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java index 38f7623698..7381be5731 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java @@ -6,8 +6,8 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.ScriptQueue; import net.aufdemrand.denizen.scripts.commands.core.DetermineCommand; -import net.aufdemrand.denizen.utilities.arguments.Script; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.Script; +import net.aufdemrand.denizen.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java index c016c15da1..ff7758beb3 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java @@ -7,7 +7,7 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.events.ReplaceableTagEvent; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.arguments.aH; +import net.aufdemrand.denizen.arguments.aH; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/_templateTag.java b/src/main/java/net/aufdemrand/denizen/tags/core/_templateTag.java index 184b4e1fb8..65f0c71dd9 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/_templateTag.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/_templateTag.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.events.ReplaceableTagEvent; import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.aufdemrand.denizen.utilities.arguments.dList; +import net.aufdemrand.denizen.arguments.aH; +import net.aufdemrand.denizen.arguments.dList; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java index 060c6ec223..0d88c2e086 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java @@ -6,16 +6,13 @@ import net.aufdemrand.denizen.Settings; import net.aufdemrand.denizen.npc.dNPC; -import net.aufdemrand.denizen.scripts.ScriptRegistry; -import net.aufdemrand.denizen.scripts.containers.core.TaskScriptContainer; -import net.aufdemrand.denizen.utilities.arguments.aH; -import net.minecraft.server.v1_5_R2.EntityLiving; +import net.aufdemrand.denizen.arguments.aH; +import net.minecraft.server.v1_5_R3.EntityLiving; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.OfflinePlayer; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftLivingEntity; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -258,7 +255,7 @@ public static void rotate(Entity entity, float yaw, float pitch) else { - net.minecraft.server.v1_5_R2.Entity handle = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_5_R3.Entity handle = ((CraftEntity) entity).getHandle(); handle.yaw = (float) yaw; handle.pitch = (float) pitch; } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java b/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java index a997f7d062..4f0c1d6059 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java @@ -1,9 +1,9 @@ package net.aufdemrand.denizen.utilities.nbt; -import net.minecraft.server.v1_5_R2.EntityLiving; -import net.minecraft.server.v1_5_R2.NBTTagCompound; -import org.bukkit.craftbukkit.v1_5_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftItemStack; +import net.minecraft.server.v1_5_R3.EntityLiving; +import net.minecraft.server.v1_5_R3.NBTTagCompound; +import org.bukkit.craftbukkit.v1_5_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftItemStack; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.ItemStack; @@ -21,7 +21,7 @@ public static MapOfEnchantments getEnchantments(ItemStack item) { public static boolean hasCustomNBT(ItemStack item, String key) { NBTTagCompound tag; - net.minecraft.server.v1_5_R2.ItemStack cis = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_5_R3.ItemStack cis = CraftItemStack.asNMSCopy(item); if (!cis.hasTag()) return false; tag = cis.getTag(); // dB.echoDebug(tag.toString()); @@ -30,7 +30,7 @@ public static boolean hasCustomNBT(ItemStack item, String key) { } public static String getCustomNBT(ItemStack item, String key) { - net.minecraft.server.v1_5_R2.ItemStack cis = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_5_R3.ItemStack cis = CraftItemStack.asNMSCopy(item); NBTTagCompound tag; if (!cis.hasTag()) cis.setTag(new NBTTagCompound()); @@ -42,7 +42,7 @@ public static String getCustomNBT(ItemStack item, String key) { } public static ItemStack removeCustomNBT(ItemStack item, String key) { - net.minecraft.server.v1_5_R2.ItemStack cis = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_5_R3.ItemStack cis = CraftItemStack.asNMSCopy(item); NBTTagCompound tag; if (!cis.hasTag()) cis.setTag(new NBTTagCompound()); @@ -53,7 +53,7 @@ public static ItemStack removeCustomNBT(ItemStack item, String key) { } public static ItemStack addCustomNBT(ItemStack item, String key, String value) { - net.minecraft.server.v1_5_R2.ItemStack cis = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_5_R3.ItemStack cis = CraftItemStack.asNMSCopy(item); NBTTagCompound tag = null; // Do stuff with tag if (!cis.hasTag()) @@ -65,7 +65,7 @@ public static ItemStack addCustomNBT(ItemStack item, String key, String value) { public static LivingEntity addCustomNBT(LivingEntity entity, String key, String value) { Entity bukkitEntity = entity; - net.minecraft.server.v1_5_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + net.minecraft.server.v1_5_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); NBTTagCompound tag = new NBTTagCompound(); // Writes the entity's NBT data to tag @@ -81,7 +81,7 @@ public static LivingEntity addCustomNBT(LivingEntity entity, String key, String public static LivingEntity removeCustomNBT(LivingEntity entity, String key) { Entity bukkitEntity = entity; - net.minecraft.server.v1_5_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + net.minecraft.server.v1_5_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); NBTTagCompound tag = new NBTTagCompound(); // Writes the entity's NBT data to tag @@ -97,7 +97,7 @@ public static LivingEntity removeCustomNBT(LivingEntity entity, String key) { public static boolean hasCustomNBT(LivingEntity entity, String key) { Entity bukkitEntity = entity; - net.minecraft.server.v1_5_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + net.minecraft.server.v1_5_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); NBTTagCompound tag = new NBTTagCompound(); // Writes the entity's NBT data to tag @@ -109,7 +109,7 @@ public static boolean hasCustomNBT(LivingEntity entity, String key) { public static String getCustomNBT(LivingEntity entity, String key) { Entity bukkitEntity = entity; - net.minecraft.server.v1_5_R2.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + net.minecraft.server.v1_5_R3.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); NBTTagCompound tag = new NBTTagCompound(); // Writes the entity's NBT data to tag diff --git a/src/main/java/net/aufdemrand/denizen/utilities/nbt/LeatherColorer.java b/src/main/java/net/aufdemrand/denizen/utilities/nbt/LeatherColorer.java index e61ec41d48..0666d19cca 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/nbt/LeatherColorer.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/nbt/LeatherColorer.java @@ -1,6 +1,6 @@ package net.aufdemrand.denizen.utilities.nbt; -import net.aufdemrand.denizen.utilities.arguments.dItem; +import net.aufdemrand.denizen.arguments.dItem; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.Color; import org.bukkit.inventory.meta.LeatherArmorMeta; diff --git a/src/test/java/net/aufdemrand/denizen/arguments/ArgumentTests.java b/src/test/java/net/aufdemrand/denizen/arguments/ArgumentTests.java index 3b8dd9ee02..2cb8c1f50a 100644 --- a/src/test/java/net/aufdemrand/denizen/arguments/ArgumentTests.java +++ b/src/test/java/net/aufdemrand/denizen/arguments/ArgumentTests.java @@ -1,6 +1,5 @@ package net.aufdemrand.denizen.arguments; -import net.aufdemrand.denizen.utilities.arguments.Script; import org.junit.Test; public class ArgumentTests {