Merge pull request #161 from IntellectualCrafters/2.8

2.8

.gitignore

@@ -1,3 +1,4 @@
+PlotSquared/.project
 # Created by https://www.gitignore.io
 
 ### Intellij ###
@@ -48,6 +49,8 @@ com_crashlytics_export_strings.xml
 
 
 ### Eclipse ###
+.classpath
+.project
 *.pydevproject
 .metadata
 .gradle
@@ -93,8 +96,6 @@ local.properties
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-.classpath
-.project
 /target
 /plotsquared/target
 *.MF

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java

@@ -4,7 +4,6 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Byte_Array} tag.
  */
 public final class ByteArrayTag extends Tag {
-
     private final byte[] value;
     
     /**
@@ -50,5 +49,4 @@ public final class ByteArrayTag extends Tag {
         }
         return "TAG_Byte_Array" + append + ": " + hex;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java

@@ -4,7 +4,6 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Byte} tag.
  */
 public final class ByteTag extends Tag {
-
     private final byte value;
     
     /**
@@ -42,5 +41,4 @@ public final class ByteTag extends Tag {
         }
         return "TAG_Byte" + append + ": " + this.value;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java

@@ -9,7 +9,6 @@ import java.util.Map;
  * The {@code TAG_Compound} tag.
  */
 public final class CompoundTag extends Tag {
-
     private final Map<String, Tag> value;
     
     /**
@@ -132,22 +131,16 @@ public final class CompoundTag extends Tag {
         final Tag tag = this.value.get(key);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
-
         } else if (tag instanceof ShortTag) {
             return ((ShortTag) tag).getValue();
-
         } else if (tag instanceof IntTag) {
             return ((IntTag) tag).getValue();
-
         } else if (tag instanceof LongTag) {
             return ((LongTag) tag).getValue();
-
         } else if (tag instanceof FloatTag) {
             return ((FloatTag) tag).getValue();
-
         } else if (tag instanceof DoubleTag) {
             return ((DoubleTag) tag).getValue();
-
         } else {
             return 0;
         }
@@ -216,22 +209,16 @@ public final class CompoundTag extends Tag {
         final Tag tag = this.value.get(key);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
-
         } else if (tag instanceof ShortTag) {
             return ((ShortTag) tag).getValue();
-
         } else if (tag instanceof IntTag) {
             return ((IntTag) tag).getValue();
-
         } else if (tag instanceof LongTag) {
             return ((LongTag) tag).getValue().intValue();
-
         } else if (tag instanceof FloatTag) {
             return ((FloatTag) tag).getValue().intValue();
-
         } else if (tag instanceof DoubleTag) {
             return ((DoubleTag) tag).getValue().intValue();
-
         } else {
             return 0;
         }
@@ -267,7 +254,7 @@ public final class CompoundTag extends Tag {
         if (tag instanceof ListTag) {
             return (ListTag) tag;
         } else {
-            return new ListTag(key, StringTag.class, Collections.<Tag>emptyList());
+            return new ListTag(key, StringTag.class, Collections.<Tag> emptyList());
         }
     }
     
@@ -326,22 +313,16 @@ public final class CompoundTag extends Tag {
         final Tag tag = this.value.get(key);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
-
         } else if (tag instanceof ShortTag) {
             return ((ShortTag) tag).getValue();
-
         } else if (tag instanceof IntTag) {
             return ((IntTag) tag).getValue();
-
         } else if (tag instanceof LongTag) {
             return ((LongTag) tag).getValue();
-
         } else if (tag instanceof FloatTag) {
             return ((FloatTag) tag).getValue().longValue();
-
         } else if (tag instanceof DoubleTag) {
             return ((DoubleTag) tag).getValue().longValue();
-
         } else {
             return 0L;
         }
@@ -396,5 +377,4 @@ public final class CompoundTag extends Tag {
         bldr.append("}");
         return bldr.toString();
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java

@@ -9,7 +9,6 @@ import java.util.Map;
  * Helps create compound tags.
  */
 public class CompoundTagBuilder {
-
     private final Map<String, Tag> entries;
     
     /**
@@ -195,5 +194,4 @@ public class CompoundTagBuilder {
     public CompoundTag build(final String name) {
         return new CompoundTag(name, new HashMap<String, Tag>(this.entries));
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java

@@ -4,7 +4,6 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Double} tag.
  */
 public final class DoubleTag extends Tag {
-
     private final double value;
     
     /**
@@ -42,5 +41,4 @@ public final class DoubleTag extends Tag {
         }
         return "TAG_Double" + append + ": " + this.value;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/EndTag.java

@@ -4,7 +4,6 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_End} tag.
  */
 public final class EndTag extends Tag {
-
     /**
      * Creates the tag.
      */
@@ -21,5 +20,4 @@ public final class EndTag extends Tag {
     public String toString() {
         return "TAG_End";
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java

@@ -4,7 +4,6 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Float} tag.
  */
 public final class FloatTag extends Tag {
-
     private final float value;
     
     /**
@@ -42,5 +41,4 @@ public final class FloatTag extends Tag {
         }
         return "TAG_Float" + append + ": " + this.value;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java

@@ -6,7 +6,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * The {@code TAG_Int_Array} tag.
  */
 public final class IntArrayTag extends Tag {
-
     private final int[] value;
     
     /**
@@ -54,5 +53,4 @@ public final class IntArrayTag extends Tag {
         }
         return "TAG_Int_Array" + append + ": " + hex;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntTag.java

@@ -4,7 +4,6 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Int} tag.
  */
 public final class IntTag extends Tag {
-
     private final int value;
     
     /**
@@ -42,5 +41,4 @@ public final class IntTag extends Tag {
         }
         return "TAG_Int" + append + ": " + this.value;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTag.java

@@ -12,7 +12,6 @@ import javax.annotation.Nullable;
  * The {@code TAG_List} tag.
  */
 public final class ListTag extends Tag {
-
     private final Class<? extends Tag> type;
     private final List<Tag> value;
     
@@ -147,22 +146,16 @@ public final class ListTag extends Tag {
         final Tag tag = getIfExists(index);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
-
         } else if (tag instanceof ShortTag) {
             return ((ShortTag) tag).getValue();
-
         } else if (tag instanceof IntTag) {
             return ((IntTag) tag).getValue();
-
         } else if (tag instanceof LongTag) {
             return ((LongTag) tag).getValue();
-
         } else if (tag instanceof FloatTag) {
             return ((FloatTag) tag).getValue();
-
         } else if (tag instanceof DoubleTag) {
             return ((DoubleTag) tag).getValue();
-
         } else {
             return 0;
         }
@@ -231,22 +224,16 @@ public final class ListTag extends Tag {
         final Tag tag = getIfExists(index);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
-
         } else if (tag instanceof ShortTag) {
             return ((ShortTag) tag).getValue();
-
         } else if (tag instanceof IntTag) {
             return ((IntTag) tag).getValue();
-
         } else if (tag instanceof LongTag) {
             return ((LongTag) tag).getValue().intValue();
-
         } else if (tag instanceof FloatTag) {
             return ((FloatTag) tag).getValue().intValue();
-
         } else if (tag instanceof DoubleTag) {
             return ((DoubleTag) tag).getValue().intValue();
-
         } else {
             return 0;
         }
@@ -282,7 +269,7 @@ public final class ListTag extends Tag {
         if (tag instanceof ListTag) {
             return (ListTag) tag;
         } else {
-            return new ListTag(StringTag.class, Collections.<Tag>emptyList());
+            return new ListTag(StringTag.class, Collections.<Tag> emptyList());
         }
     }
     
@@ -341,22 +328,16 @@ public final class ListTag extends Tag {
         final Tag tag = getIfExists(index);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
-
         } else if (tag instanceof ShortTag) {
             return ((ShortTag) tag).getValue();
-
         } else if (tag instanceof IntTag) {
             return ((IntTag) tag).getValue();
-
         } else if (tag instanceof LongTag) {
             return ((LongTag) tag).getValue();
-
         } else if (tag instanceof FloatTag) {
             return ((FloatTag) tag).getValue().longValue();
-
         } else if (tag instanceof DoubleTag) {
             return ((DoubleTag) tag).getValue().longValue();
-
         } else {
             return 0;
         }
@@ -411,5 +392,4 @@ public final class ListTag extends Tag {
         bldr.append("}");
         return bldr.toString();
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java

@@ -11,7 +11,6 @@ import java.util.List;
  * Helps create list tags.
  */
 public class ListTagBuilder {
-
     private final Class<? extends Tag> type;
     private final List<Tag> entries;
     
@@ -43,18 +42,15 @@ public class ListTagBuilder {
     @SafeVarargs
     public static <T extends Tag> ListTagBuilder createWith(final T... entries) {
         checkNotNull(entries);
-
         if (entries.length == 0) {
             throw new IllegalArgumentException("This method needs an array of at least one entry");
         }
-
         final Class<? extends Tag> type = entries[0].getClass();
         for (int i = 1; i < entries.length; i++) {
             if (!type.isInstance(entries[i])) {
                 throw new IllegalArgumentException("An array of different tag types was provided");
             }
         }
-
         final ListTagBuilder builder = new ListTagBuilder(type);
         builder.addAll(Arrays.asList(entries));
         return builder;
@@ -110,5 +106,4 @@ public class ListTagBuilder {
     public ListTag build(final String name) {
         return new ListTag(name, this.type, new ArrayList<Tag>(this.entries));
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/LongTag.java

@@ -4,7 +4,6 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Long} tag.
  */
 public final class LongTag extends Tag {
-
     private final long value;
     
     /**
@@ -42,5 +41,4 @@ public final class LongTag extends Tag {
         }
         return "TAG_Long" + append + ": " + this.value;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.jnbt;
 
 import java.nio.charset.Charset;
@@ -27,16 +26,13 @@ import java.nio.charset.Charset;
  * A class which holds constant values.
  */
 public final class NBTConstants {
-
     public static final Charset CHARSET = Charset.forName("UTF-8");
-
     public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2, TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6, TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9, TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11;
     
     /**
      * Default private constructor.
      */
     private NBTConstants() {
-
     }
     
     /**
@@ -78,5 +74,4 @@ public final class NBTConstants {
                 throw new IllegalArgumentException("Unknown tag type ID of " + id);
         }
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java

@@ -15,7 +15,6 @@ import java.util.Map;
  * may be found at <a href="http://www.minecraft.net/docs/NBT.txt"> http://www.minecraft.net/docs/NBT.txt</a>. </p>
  */
 public final class NBTInputStream implements Closeable {
-
     private final DataInputStream is;
     
     /**
@@ -51,7 +50,6 @@ public final class NBTInputStream implements Closeable {
      */
     private Tag readTag(final int depth) throws IOException {
         final int type = this.is.readByte() & 0xFF;
-
         String name;
         if (type != NBTConstants.TYPE_END) {
             final int nameLength = this.is.readShort() & 0xFFFF;
@@ -61,7 +59,6 @@ public final class NBTInputStream implements Closeable {
         } else {
             name = "";
         }
-
         return readTagPayload(type, name, depth);
     }
     
@@ -109,7 +106,6 @@ public final class NBTInputStream implements Closeable {
             case NBTConstants.TYPE_LIST:
                 final int childType = this.is.readByte();
                 length = this.is.readInt();
-
                 final List<Tag> tagList = new ArrayList<Tag>();
                 for (int i = 0; i < length; ++i) {
                     final Tag tag = readTagPayload(childType, "", depth + 1);
@@ -118,7 +114,6 @@ public final class NBTInputStream implements Closeable {
                     }
                     tagList.add(tag);
                 }
-
                 return new ListTag(name, NBTUtils.getTypeClass(childType), tagList);
             case NBTConstants.TYPE_COMPOUND:
                 final Map<String, Tag> tagMap = new HashMap<String, Tag>();
@@ -130,7 +125,6 @@ public final class NBTInputStream implements Closeable {
                         tagMap.put(tag.getName(), tag);
                     }
                 }
-
                 return new CompoundTag(name, tagMap);
             case NBTConstants.TYPE_INT_ARRAY:
                 length = this.is.readInt();
@@ -148,5 +142,4 @@ public final class NBTInputStream implements Closeable {
     public void close() throws IOException {
         this.is.close();
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.jnbt;
 
 import java.io.Closeable;
@@ -36,7 +35,6 @@ import java.util.List;
  * @author Graham Edgecombe
  */
 public final class NBTOutputStream implements Closeable {
-
     /**
      * The output stream.
      */
@@ -64,15 +62,12 @@ public final class NBTOutputStream implements Closeable {
         final int type = NBTUtils.getTypeCode(tag.getClass());
         final String name = tag.getName();
         final byte[] nameBytes = name.getBytes(NBTConstants.CHARSET);
-
         this.os.writeByte(type);
         this.os.writeShort(nameBytes.length);
         this.os.write(nameBytes);
-
         if (type == NBTConstants.TYPE_END) {
             throw new IOException("Named TAG_End not permitted.");
         }
-
         writeTagPayload(tag);
     }
     
@@ -176,7 +171,6 @@ public final class NBTOutputStream implements Closeable {
         final Class<? extends Tag> clazz = tag.getType();
         final List<Tag> tags = tag.getValue();
         final int size = tags.size();
-
         this.os.writeByte(NBTUtils.getTypeCode(clazz));
         this.os.writeInt(size);
         for (final Tag tag1 : tags) {
@@ -275,5 +269,4 @@ public final class NBTOutputStream implements Closeable {
     public void close() throws IOException {
         this.os.close();
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java

@@ -6,7 +6,6 @@ import java.util.Map;
  * A class which contains NBT-related utility methods.
  */
 public final class NBTUtils {
-
     /**
      * Default private constructor.
      */
@@ -148,5 +147,4 @@ public final class NBTUtils {
         }
         return expected.cast(tag);
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java

@@ -18,14 +18,12 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.jnbt;
 
 /**
  * The {@code TAG_Short} tag.
  */
 public final class ShortTag extends Tag {
-
     private final short value;
     
     /**
@@ -63,5 +61,4 @@ public final class ShortTag extends Tag {
         }
         return "TAG_Short" + append + ": " + this.value;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/StringTag.java

@@ -6,7 +6,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * The {@code TAG_String} tag.
  */
 public final class StringTag extends Tag {
-
     private final String value;
     
     /**
@@ -46,5 +45,4 @@ public final class StringTag extends Tag {
         }
         return "TAG_String" + append + ": " + this.value;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/Tag.java

@@ -18,14 +18,12 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.jnbt;
 
 /**
  * Represents a NBT tag.
  */
 public abstract class Tag {
-
     private final String name;
     
     /**
@@ -62,5 +60,4 @@ public abstract class Tag {
      * @return the value
      */
     public abstract Object getValue();
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/jnbt/WorldEditUtils.java

@@ -4,11 +4,8 @@ import org.bukkit.World;
 
 public class WorldEditUtils {
     public static void setNBT(final World world, final short id, final byte data, final int x, final int y, final int z, final com.intellectualcrafters.jnbt.CompoundTag tag) {
-
         // final LocalWorld bukkitWorld = BukkitUtil.getLocalWorld(world);
-
         // I need to somehow convert our CompoundTag to WorldEdit's
-
         // final BaseBlock block = new BaseBlock(5, 5, (CompoundTag) tag);
         // final Vector vector = new Vector(x, y, z);
         // try {

PlotSquared/src/main/java/com/intellectualcrafters/json/CDL.java

@@ -18,7 +18,6 @@ package com.intellectualcrafters.json;
  * @version 2014-05-03
  */
 public class CDL {
-
     /**
      * Get the next value. The value can be wrapped in quotes. The value can be empty.
      *
@@ -42,7 +41,7 @@ public class CDL {
             case '\'':
                 q = c;
                 sb = new StringBuffer();
-                for (; ; ) {
+                for (;;) {
                     c = x.next();
                     if (c == q) {
                         break;
@@ -73,14 +72,14 @@ public class CDL {
      */
     public static JSONArray rowToJSONArray(final JSONTokener x) throws JSONException {
         final JSONArray ja = new JSONArray();
-        for (; ; ) {
+        for (;;) {
             final String value = getValue(x);
             char c = x.next();
             if ((value == null) || ((ja.length() == 0) && (value.length() == 0) && (c != ','))) {
                 return null;
             }
             ja.put(value);
-            for (; ; ) {
+            for (;;) {
                 if (c == ',') {
                     break;
                 }
@@ -205,7 +204,7 @@ public class CDL {
             return null;
         }
         final JSONArray ja = new JSONArray();
-        for (; ; ) {
+        for (;;) {
             final JSONObject jo = rowToJSONObject(names, x);
             if (jo == null) {
                 break;

PlotSquared/src/main/java/com/intellectualcrafters/json/Cookie.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.json;
 
 /**
@@ -29,7 +28,6 @@ package com.intellectualcrafters.json;
  * @version 2014-05-03
  */
 public class Cookie {
-
     /**
      * Produce a copy of a string in which the characters '+', '%', '=', ';' and control characters are replaced with
      * "%hh". This is a gentle form of URL encoding, attempting to cause as little distortion to the string as possible.
@@ -112,7 +110,6 @@ public class Cookie {
      */
     public static String toString(final JSONObject jo) throws JSONException {
         final StringBuilder sb = new StringBuilder();
-
         sb.append(escape(jo.getString("name")));
         sb.append("=");
         sb.append(escape(jo.getString("value")));

PlotSquared/src/main/java/com/intellectualcrafters/json/CookieList.java

@@ -9,7 +9,6 @@ import java.util.Iterator;
  * @version 2014-05-03
  */
 public class CookieList {
-
     /**
      * Convert a cookie list into a JSONObject. A cookie list is a sequence of name/value pairs. The names are separated
      * from the values by '='. The pairs are separated by ';'. The names and the values will be unescaped, possibly

PlotSquared/src/main/java/com/intellectualcrafters/json/HTTP.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.json;
 
 import java.util.Iterator;
@@ -30,7 +29,6 @@ import java.util.Iterator;
  * @version 2014-05-03
  */
 public class HTTP {
-
     /**
      * Carriage return/line feed.
      */
@@ -93,28 +91,20 @@ public class HTTP {
         final JSONObject jo = new JSONObject();
         final HTTPTokener x = new HTTPTokener(string);
         String token;
-
         token = x.nextToken();
         if (token.toUpperCase().startsWith("HTTP")) {
-
             // Response
-
             jo.put("HTTP-Version", token);
             jo.put("Status-Code", x.nextToken());
             jo.put("Reason-Phrase", x.nextTo('\0'));
             x.next();
-
         } else {
-
             // Request
-
             jo.put("Method", token);
             jo.put("Request-URI", x.nextToken());
             jo.put("HTTP-Version", x.nextToken());
         }
-
         // Fields
-
         while (x.more()) {
             final String name = x.nextTo(':');
             x.next(':');

PlotSquared/src/main/java/com/intellectualcrafters/json/HTTPTokener.java

@@ -7,7 +7,6 @@ package com.intellectualcrafters.json;
  * @version 2014-05-03
  */
 public class HTTPTokener extends JSONTokener {
-
     /**
      * Construct an HTTPTokener from a string.
      *
@@ -33,7 +32,7 @@ public class HTTPTokener extends JSONTokener {
         } while (Character.isWhitespace(c));
         if ((c == '"') || (c == '\'')) {
             q = c;
-            for (; ; ) {
+            for (;;) {
                 c = next();
                 if (c < ' ') {
                     throw syntaxError("Unterminated string.");
@@ -44,7 +43,7 @@ public class HTTPTokener extends JSONTokener {
                 sb.append(c);
             }
         }
-        for (; ; ) {
+        for (;;) {
             if ((c == 0) || Character.isWhitespace(c)) {
                 return sb.toString();
             }

PlotSquared/src/main/java/com/intellectualcrafters/json/JSONArray.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.json;
 
 import java.io.IOException;
@@ -58,7 +57,6 @@ import java.util.Map;
  * @version 2014-05-03
  */
 public class JSONArray {
-
     /**
      * The arrayList where the JSONArray's properties are kept.
      */
@@ -85,7 +83,7 @@ public class JSONArray {
         }
         if (x.nextClean() != ']') {
             x.back();
-            for (; ; ) {
+            for (;;) {
                 if (x.nextClean() == ',') {
                     x.back();
                     this.myArrayList.add(JSONObject.NULL);
@@ -317,7 +315,6 @@ public class JSONArray {
     public String join(final String separator) throws JSONException {
         final int len = this.length();
         final StringBuilder sb = new StringBuilder();
-
         for (int i = 0; i < len; i += 1) {
             if (i > 0) {
                 sb.append(separator);
@@ -855,12 +852,10 @@ public class JSONArray {
             boolean commanate = false;
             final int length = this.length();
             writer.write('[');
-
             if (length == 1) {
                 JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent);
             } else if (length != 0) {
                 final int newindent = indent + indentFactor;
-
                 for (int i = 0; i < length; i += 1) {
                     if (commanate) {
                         writer.write(',');

PlotSquared/src/main/java/com/intellectualcrafters/json/JSONML.java

@@ -10,7 +10,6 @@ import java.util.Iterator;
  * @version 2014-05-03
  */
 public class JSONML {
-
     /**
      * Parse XML values and store them in a JSONArray.
      *
@@ -31,13 +30,11 @@ public class JSONML {
         JSONObject newjo = null;
         Object token;
         String tagName = null;
-
         // Test for and skip past these forms:
         // <!-- ... -->
         // <![ ... ]]>
         // <! ... >
         // <? ... ?>
-
         while (true) {
             if (!x.more()) {
                 throw x.syntaxError("Bad XML");
@@ -47,9 +44,7 @@ public class JSONML {
                 token = x.nextToken();
                 if (token instanceof Character) {
                     if (token == XML.SLASH) {
-
                         // Close tag </
-
                         token = x.nextToken();
                         if (!(token instanceof String)) {
                             throw new JSONException("Expected a closing name instead of '" + token + "'.");
@@ -59,9 +54,7 @@ public class JSONML {
                         }
                         return token;
                     } else if (token == XML.BANG) {
-
                         // <!
-
                         c = x.next();
                         if (c == '-') {
                             if (x.next() == '-') {
@@ -92,16 +85,12 @@ public class JSONML {
                             } while (i > 0);
                         }
                     } else if (token == XML.QUEST) {
-
                         // <?
-
                         x.skipPast("?>");
                     } else {
                         throw x.syntaxError("Misshaped tag");
                     }
-
                     // Open tag <
-
                 } else {
                     if (!(token instanceof String)) {
                         throw x.syntaxError("Bad tagName '" + token + "'.");
@@ -121,7 +110,7 @@ public class JSONML {
                         }
                     }
                     token = null;
-                    for (; ; ) {
+                    for (;;) {
                         if (token == null) {
                             token = x.nextToken();
                         }
@@ -131,9 +120,7 @@ public class JSONML {
                         if (!(token instanceof String)) {
                             break;
                         }
-
                         // attribute = value
-
                         attribute = (String) token;
                         if (!arrayForm && ("tagName".equals(attribute) || "childNode".equals(attribute))) {
                             throw x.syntaxError("Reserved attribute.");
@@ -153,9 +140,7 @@ public class JSONML {
                     if (arrayForm && (newjo.length() > 0)) {
                         newja.put(newjo);
                     }
-
                     // Empty tag <.../>
-
                     if (token == XML.SLASH) {
                         if (x.nextToken() != XML.GT) {
                             throw x.syntaxError("Misshaped tag");
@@ -167,9 +152,7 @@ public class JSONML {
                                 return newjo;
                             }
                         }
-
                         // Content, between <...> and </...>
-
                     } else {
                         if (token != XML.GT) {
                             throw x.syntaxError("Misshaped tag");
@@ -289,22 +272,17 @@ public class JSONML {
         final StringBuilder sb = new StringBuilder();
         String tagName;
         String value;
-
         // Emit <tagName
-
         tagName = ja.getString(0);
         XML.noSpace(tagName);
         tagName = XML.escape(tagName);
         sb.append('<');
         sb.append(tagName);
-
         object = ja.opt(1);
         if (object instanceof JSONObject) {
             i = 2;
             jo = (JSONObject) object;
-
             // Emit the attributes
-
             keys = jo.keys();
             while (keys.hasNext()) {
                 key = keys.next();
@@ -322,9 +300,7 @@ public class JSONML {
         } else {
             i = 1;
         }
-
         // Emit content in body
-
         length = ja.length();
         if (i >= length) {
             sb.append('/');
@@ -373,9 +349,7 @@ public class JSONML {
         Object object;
         String tagName;
         String value;
-
         // Emit <tagName
-
         tagName = jo.optString("tagName");
         if (tagName == null) {
             return XML.escape(jo.toString());
@@ -384,9 +358,7 @@ public class JSONML {
         tagName = XML.escape(tagName);
         sb.append('<');
         sb.append(tagName);
-
         // Emit the attributes
-
         keys = jo.keys();
         while (keys.hasNext()) {
             key = keys.next();
@@ -403,9 +375,7 @@ public class JSONML {
                 }
             }
         }
-
         // Emit content in body
-
         ja = jo.optJSONArray("childNodes");
         if (ja == null) {
             sb.append('/');

PlotSquared/src/main/java/com/intellectualcrafters/json/JSONObject.java

@@ -103,11 +103,10 @@ public class JSONObject {
         this();
         char c;
         String key;
-
         if (x.nextClean() != '{') {
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
-        for (; ; ) {
+        for (;;) {
             c = x.nextClean();
             switch (c) {
                 case 0:
@@ -118,17 +117,13 @@ public class JSONObject {
                     x.back();
                     key = x.nextValue().toString();
             }
-
             // The key is followed by ':'.
-
             c = x.nextClean();
             if (c != ':') {
                 throw x.syntaxError("Expected a ':' after a key");
             }
             this.putOnce(key, x.nextValue());
-
             // Pairs are separated by ','.
-
             switch (x.nextClean()) {
                 case ';':
                 case ',':
@@ -226,20 +221,16 @@ public class JSONObject {
     public JSONObject(final String baseName, final Locale locale) throws JSONException {
         this();
         final ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale, Thread.currentThread().getContextClassLoader());
-
         // Iterate through the keys in the bundle.
-
         final Enumeration<String> keys = bundle.getKeys();
         while (keys.hasMoreElements()) {
             final Object key = keys.nextElement();
             if (key != null) {
-
                 // Go through the path, ensuring that there is a nested
                 // JSONObject for each
                 // segment except the last. Add the value using the last
                 // segment's name into
                 // the deepest nested JSONObject.
-
                 final String[] path = ((String) key).split("\\.");
                 final int last = path.length - 1;
                 JSONObject target = this;
@@ -268,9 +259,7 @@ public class JSONObject {
         if (Double.isInfinite(d) || Double.isNaN(d)) {
             return "null";
         }
-
         // Shave off trailing zeros and decimal point, if possible.
-
         String string = Double.toString(d);
         if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0)) {
             while (string.endsWith("0")) {
@@ -339,9 +328,7 @@ public class JSONObject {
             throw new JSONException("Null pointer");
         }
         testValidity(number);
-
         // Shave off trailing zeros and decimal point, if possible.
-
         String string = number.toString();
         if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0)) {
             while (string.endsWith("0")) {
@@ -380,13 +367,11 @@ public class JSONObject {
             w.write("\"\"");
             return w;
         }
-
         char b;
         char c = 0;
         String hhhh;
         int i;
         final int len = string.length();
-
         w.write('"');
         for (i = 0; i < len; i += 1) {
             b = c;
@@ -454,12 +439,10 @@ public class JSONObject {
         if (string.equalsIgnoreCase("null")) {
             return JSONObject.NULL;
         }
-
         /*
          * If it might be a number, try converting it. If a number cannot be
          * produced, then the value will just be a string.
          */
-
         final char b = string.charAt(0);
         if (((b >= '0') && (b <= '9')) || (b == '-')) {
             try {
@@ -576,7 +559,6 @@ public class JSONObject {
             if ((object instanceof JSONObject) || (object instanceof JSONArray) || NULL.equals(object) || (object instanceof JSONString) || (object instanceof Byte) || (object instanceof Character) || (object instanceof Short) || (object instanceof Integer) || (object instanceof Long) || (object instanceof Boolean) || (object instanceof Float) || (object instanceof Double) || (object instanceof String)) {
                 return object;
             }
-
             if (object instanceof Collection) {
                 return new JSONArray((Collection<Object>) object);
             }
@@ -1104,11 +1086,8 @@ public class JSONObject {
     
     private void populateMap(final Object bean) {
         final Class klass = bean.getClass();
-
         // If klass is a System class then set includeSuperClass to false.
-
         final boolean includeSuperClass = klass.getClassLoader() != null;
-
         final Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
         for (final Method method : methods) {
             try {
@@ -1130,7 +1109,6 @@ public class JSONObject {
                         } else if (!Character.isUpperCase(key.charAt(1))) {
                             key = key.substring(0, 1).toLowerCase() + key.substring(1);
                         }
-
                         final Object result = method.invoke(bean, (Object[]) null);
                         if (result != null) {
                             this.map.put(key, wrap(result));
@@ -1433,7 +1411,6 @@ public class JSONObject {
             final int length = this.length();
             final Iterator<String> keys = this.keys();
             writer.write('{');
-
             if (length == 1) {
                 final Object key = keys.next();
                 writer.write(quote(key.toString()));
@@ -1478,7 +1455,6 @@ public class JSONObject {
      * value that JavaScript calls undefined.
      */
     private static final class Null {
-
         /**
          * There is only intended to be a single instance of the NULL object, so the clone method returns itself.
          *

PlotSquared/src/main/java/com/intellectualcrafters/json/JSONTokener.java

@@ -15,7 +15,6 @@ import java.io.StringReader;
  * @version 2014-05-03
  */
 public class JSONTokener {
-
     private final Reader reader;
     private long character;
     private boolean eof;
@@ -125,7 +124,6 @@ public class JSONTokener {
             } catch (final IOException exception) {
                 throw new JSONException(exception);
             }
-
             if (c <= 0) { // End of stream
                 this.eof = true;
                 c = 0;
@@ -175,10 +173,8 @@ public class JSONTokener {
         if (n == 0) {
             return "";
         }
-
         final char[] chars = new char[n];
         int pos = 0;
-
         while (pos < n) {
             chars[pos] = this.next();
             if (this.end()) {
@@ -197,7 +193,7 @@ public class JSONTokener {
      * @throws JSONException
      */
     public char nextClean() throws JSONException {
-        for (; ; ) {
+        for (;;) {
             final char c = this.next();
             if ((c == 0) || (c > ' ')) {
                 return c;
@@ -219,7 +215,7 @@ public class JSONTokener {
     public String nextString(final char quote) throws JSONException {
         char c;
         final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
+        for (;;) {
             c = this.next();
             switch (c) {
                 case 0:
@@ -275,7 +271,7 @@ public class JSONTokener {
      */
     public String nextTo(final char delimiter) throws JSONException {
         final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
+        for (;;) {
             final char c = this.next();
             if ((c == delimiter) || (c == 0) || (c == '\n') || (c == '\r')) {
                 if (c != 0) {
@@ -298,7 +294,7 @@ public class JSONTokener {
     public String nextTo(final String delimiters) throws JSONException {
         char c;
         final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
+        for (;;) {
             c = this.next();
             if ((delimiters.indexOf(c) >= 0) || (c == 0) || (c == '\n') || (c == '\r')) {
                 if (c != 0) {
@@ -321,7 +317,6 @@ public class JSONTokener {
     public Object nextValue() throws JSONException {
         char c = this.nextClean();
         String string;
-
         switch (c) {
             case '"':
             case '\'':
@@ -333,7 +328,6 @@ public class JSONTokener {
                 this.back();
                 return new JSONArray(this);
         }
-
         /*
          * Handle unquoted text. This could be the values true, false, or
          * null, or it can be a number. An implementation (such as this one)
@@ -341,14 +335,12 @@ public class JSONTokener {
          * Accumulate characters until we reach the end of the text or a
          * formatting character.
          */
-
         final StringBuilder sb = new StringBuilder();
         while ((c >= ' ') && (",:]}/\\\"[{;=#".indexOf(c) < 0)) {
             sb.append(c);
             c = this.next();
         }
         this.back();
-
         string = sb.toString().trim();
         if ("".equals(string)) {
             throw this.syntaxError("Missing value");

PlotSquared/src/main/java/com/intellectualcrafters/json/JSONWriter.java

@@ -216,7 +216,6 @@ public class JSONWriter {
             return this;
         }
         throw new JSONException("Misplaced object.");
-
     }
     
     /**

PlotSquared/src/main/java/com/intellectualcrafters/json/Kim.java

@@ -27,7 +27,6 @@ package com.intellectualcrafters.json;
  * @version 2013-04-18
  */
 public class Kim {
-
     /**
      * The number of bytes in the kim. The number of bytes can be as much as three times the number of characters.
      */
@@ -53,11 +52,9 @@ public class Kim {
      * @param thru  The index of the last byte plus one.
      */
     public Kim(final byte[] bytes, final int from, final int thru) {
-
         // As the bytes are copied into the new kim, a hashcode is computed
         // using a
         // modified Fletcher code.
-
         int sum = 1;
         int value;
         this.hashcode = 0;
@@ -106,10 +103,8 @@ public class Kim {
         final int stringLength = string.length();
         this.hashcode = 0;
         this.length = 0;
-
         // First pass: Determine the length of the kim, allowing for the UTF-16
         // to UTF-32 conversion, and then the UTF-32 to Kim conversion.
-
         if (stringLength > 0) {
             for (int i = 0; i < stringLength; i += 1) {
                 final int c = string.charAt(i);
@@ -128,11 +123,9 @@ public class Kim {
                     this.length += 3;
                 }
             }
-
             // Second pass: Allocate a byte array and fill that array with the
             // conversion
             // while computing the hashcode.
-
             this.bytes = new byte[this.length];
             int at = 0;
             int b;

PlotSquared/src/main/java/com/intellectualcrafters/json/Property.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.json;
 
 import java.util.Enumeration;

PlotSquared/src/main/java/com/intellectualcrafters/json/XML.java

@@ -9,47 +9,38 @@ import java.util.Iterator;
  * @version 2014-05-03
  */
 public class XML {
-
     /**
      * The Character '&'.
      */
     public static final Character AMP = '&';
-
     /**
      * The Character '''.
      */
     public static final Character APOS = '\'';
-
     /**
      * The Character '!'.
      */
     public static final Character BANG = '!';
-
     /**
      * The Character '='.
      */
     public static final Character EQ = '=';
-
     /**
      * The Character '>'.
      */
     public static final Character GT = '>';
-
     /**
      * The Character '<'.
      */
     public static final Character LT = '<';
-
     /**
      * The Character '?'.
      */
     public static final Character QUEST = '?';
-
     /**
      * The Character '"'.
      */
     public static final Character QUOT = '"';
-
     /**
      * The Character '/'.
      */
@@ -135,7 +126,6 @@ public class XML {
         String string;
         String tagName;
         Object token;
-
         // Test for and skip past these forms:
         // <!-- ... -->
         // <! ... >
@@ -145,11 +135,8 @@ public class XML {
         // <>
         // <=
         // <<
-
         token = x.nextToken();
-
         // <!
-
         if (token == BANG) {
             c = x.next();
             if (c == '-') {
@@ -184,15 +171,11 @@ public class XML {
             } while (i > 0);
             return false;
         } else if (token == QUEST) {
-
             // <?
-
             x.skipPast("?>");
             return false;
         } else if (token == SLASH) {
-
             // Close tag </
-
             token = x.nextToken();
             if (name == null) {
                 throw x.syntaxError("Mismatched close tag " + token);
@@ -204,23 +187,18 @@ public class XML {
                 throw x.syntaxError("Misshaped close tag");
             }
             return true;
-
         } else if (token instanceof Character) {
             throw x.syntaxError("Misshaped tag");
-
             // Open tag <
-
         } else {
             tagName = (String) token;
             token = null;
             jsonobject = new JSONObject();
-            for (; ; ) {
+            for (;;) {
                 if (token == null) {
                     token = x.nextToken();
                 }
-
                 // attribute = value
-
                 if (token instanceof String) {
                     string = (String) token;
                     token = x.nextToken();
@@ -234,9 +212,7 @@ public class XML {
                     } else {
                         jsonobject.accumulate(string, "");
                     }
-
                     // Empty tag <.../>
-
                 } else if (token == SLASH) {
                     if (x.nextToken() != GT) {
                         throw x.syntaxError("Misshaped tag");
@@ -247,11 +223,9 @@ public class XML {
                         context.accumulate(tagName, "");
                     }
                     return false;
-
                     // Content, between <...> and </...>
-
                 } else if (token == GT) {
-                    for (; ; ) {
+                    for (;;) {
                         token = x.nextContent();
                         if (token == null) {
                             if (tagName != null) {
@@ -263,9 +237,7 @@ public class XML {
                             if (string.length() > 0) {
                                 jsonobject.accumulate("content", XML.stringToValue(string));
                             }
-
                             // Nested element
-
                         } else if (token == LT) {
                             if (parse(x, jsonobject, tagName)) {
                                 if (jsonobject.length() == 0) {
@@ -305,11 +277,9 @@ public class XML {
         if ("null".equalsIgnoreCase(string)) {
             return JSONObject.NULL;
         }
-
         // If it might be a number, try converting it, first as a Long, and then
         // as a
         // Double. If that doesn't work, return the string.
-
         try {
             final char initial = string.charAt(0);
             if ((initial == '-') || ((initial >= '0') && (initial <= '9'))) {
@@ -387,17 +357,13 @@ public class XML {
         String string;
         Object value;
         if (object instanceof JSONObject) {
-
             // Emit <tagName>
-
             if (tagName != null) {
                 sb.append('<');
                 sb.append(tagName);
                 sb.append('>');
             }
-
             // Loop thru the keys.
-
             jo = (JSONObject) object;
             keys = jo.keys();
             while (keys.hasNext()) {
@@ -407,9 +373,7 @@ public class XML {
                     value = "";
                 }
                 string = value instanceof String ? (String) value : null;
-
                 // Emit content in body
-
                 if ("content".equals(key)) {
                     if (value instanceof JSONArray) {
                         ja = (JSONArray) value;
@@ -423,9 +387,7 @@ public class XML {
                     } else {
                         sb.append(escape(value.toString()));
                     }
-
                     // Emit an array of similar keys
-
                 } else if (value instanceof JSONArray) {
                     ja = (JSONArray) value;
                     length = ja.length();
@@ -447,27 +409,21 @@ public class XML {
                     sb.append('<');
                     sb.append(key);
                     sb.append("/>");
-
                     // Emit a new tag <k>
-
                 } else {
                     sb.append(toString(value, key));
                 }
             }
             if (tagName != null) {
-
                 // Emit the </tagname> close tag
-
                 sb.append("</");
                 sb.append(tagName);
                 sb.append('>');
             }
             return sb.toString();
-
             // XML does not have good support for arrays. If an array appears in
             // a place
             // where XML is lacking, synthesize an <array> element.
-
         } else {
             if (object.getClass().isArray()) {
                 object = new JSONArray(object);

PlotSquared/src/main/java/com/intellectualcrafters/json/XMLTokener.java

@@ -7,12 +7,10 @@ package com.intellectualcrafters.json;
  * @version 2014-05-03
  */
 public class XMLTokener extends JSONTokener {
-
     /**
      * The table of entity values. It initially contains Character values for amp, apos, gt, lt, quot.
      */
     public static final java.util.HashMap<String, Character> entity;
-
     static {
         entity = new java.util.HashMap<String, Character>(8);
         entity.put("amp", XML.AMP);
@@ -42,7 +40,7 @@ public class XMLTokener extends JSONTokener {
         char c;
         int i;
         final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
+        for (;;) {
             c = next();
             if (end()) {
                 throw syntaxError("Unclosed CDATA");
@@ -77,7 +75,7 @@ public class XMLTokener extends JSONTokener {
             return XML.LT;
         }
         sb = new StringBuilder();
-        for (; ; ) {
+        for (;;) {
             if ((c == '<') || (c == 0)) {
                 back();
                 return sb.toString().trim();
@@ -103,7 +101,7 @@ public class XMLTokener extends JSONTokener {
      */
     public Object nextEntity(final char ampersand) throws JSONException {
         final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
+        for (;;) {
             final char c = next();
             if (Character.isLetterOrDigit(c) || (c == '#')) {
                 sb.append(Character.toLowerCase(c));
@@ -150,7 +148,7 @@ public class XMLTokener extends JSONTokener {
             case '"':
             case '\'':
                 q = c;
-                for (; ; ) {
+                for (;;) {
                     c = next();
                     if (c == 0) {
                         throw syntaxError("Unterminated string");
@@ -160,7 +158,7 @@ public class XMLTokener extends JSONTokener {
                     }
                 }
             default:
-                for (; ; ) {
+                for (;;) {
                     c = next();
                     if (Character.isWhitespace(c)) {
                         return Boolean.TRUE;
@@ -212,14 +210,12 @@ public class XMLTokener extends JSONTokener {
                 return XML.BANG;
             case '?':
                 return XML.QUEST;
-
                 // Quoted string
-
             case '"':
             case '\'':
                 q = c;
                 sb = new StringBuilder();
-                for (; ; ) {
+                for (;;) {
                     c = next();
                     if (c == 0) {
                         throw syntaxError("Unterminated string");
@@ -234,11 +230,9 @@ public class XMLTokener extends JSONTokener {
                     }
                 }
             default:
-
                 // Name
-
                 sb = new StringBuilder();
-                for (; ; ) {
+                for (;;) {
                     sb.append(c);
                     c = next();
                     if (Character.isWhitespace(c)) {
@@ -281,12 +275,10 @@ public class XMLTokener extends JSONTokener {
         int offset = 0;
         final int length = to.length();
         final char[] circle = new char[length];
-
         /*
          * First fill the circle buffer with as many characters as are in the
          * to string. If we reach an early end, bail.
          */
-
         for (i = 0; i < length; i += 1) {
             c = next();
             if (c == 0) {
@@ -294,15 +286,11 @@ public class XMLTokener extends JSONTokener {
             }
             circle[i] = c;
         }
-
         /* We will loop, possibly for all of the remaining characters. */
-
+        for (;;) {
-        for (; ; ) {
             j = offset;
             b = true;
-
             /* Compare the circle buffer with the to string. */
-
             for (i = 0; i < length; i += 1) {
                 if (circle[j] != to.charAt(i)) {
                     b = false;
@@ -313,15 +301,11 @@ public class XMLTokener extends JSONTokener {
                     j -= length;
                 }
             }
-
             /* If we exit the loop with b intact, then victory is ours. */
-
             if (b) {
                 return true;
             }
-
             /* Get the next character. If there isn't one, then defeat is ours. */
-
             c = next();
             if (c == 0) {
                 return false;

PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java

@@ -0,0 +1,340 @@
+package com.intellectualcrafters.plot;
+
+import java.io.File;
+import java.util.Arrays;
+
+import net.milkbowl.vault.economy.Economy;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.intellectualcrafters.plot.commands.BukkitCommand;
+import com.intellectualcrafters.plot.commands.Buy;
+import com.intellectualcrafters.plot.commands.MainCommand;
+import com.intellectualcrafters.plot.commands.WE_Anywhere;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.PlotMeConverter;
+import com.intellectualcrafters.plot.events.PlotDeleteEvent;
+import com.intellectualcrafters.plot.generator.BukkitHybridUtils;
+import com.intellectualcrafters.plot.generator.HybridGen;
+import com.intellectualcrafters.plot.generator.HybridUtils;
+import com.intellectualcrafters.plot.listeners.ForceFieldListener;
+import com.intellectualcrafters.plot.listeners.InventoryListener;
+import com.intellectualcrafters.plot.listeners.PlayerEvents;
+import com.intellectualcrafters.plot.listeners.PlayerEvents_1_8;
+import com.intellectualcrafters.plot.listeners.PlotPlusListener;
+import com.intellectualcrafters.plot.listeners.WorldEditListener;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ConsoleColors;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.SetupUtils;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.bukkit.BukkitSetupUtils;
+import com.intellectualcrafters.plot.util.bukkit.BukkitTaskManager;
+import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
+import com.intellectualcrafters.plot.util.bukkit.Metrics;
+import com.intellectualcrafters.plot.util.bukkit.SendChunk;
+import com.intellectualcrafters.plot.util.bukkit.SetBlockFast;
+import com.intellectualcrafters.plot.util.bukkit.SetBlockFast_1_8;
+import com.intellectualcrafters.plot.util.bukkit.SetBlockManager;
+import com.intellectualcrafters.plot.util.bukkit.SetBlockSlow;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+
+public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
+    public static BukkitMain THIS = null;
+    public static PlotSquared MAIN = null;
+    
+    @EventHandler
+    public static void worldLoad(final WorldLoadEvent event) {
+        UUIDHandler.cacheAll(event.getWorld().getName());
+    }
+
+    public static boolean checkVersion(final int major, final int minor, final int minor2) {
+        try {
+            final String[] version = Bukkit.getBukkitVersion().split("-")[0].split("\\.");
+            final int a = Integer.parseInt(version[0]);
+            final int b = Integer.parseInt(version[1]);
+            int c = 0;
+            if (version.length == 3) {
+                c = Integer.parseInt(version[2]);
+            }
+            if ((a > major) || ((a == major) && (b > minor)) || ((a == major) && (b == minor) && (c >= minor2))) {
+                return true;
+            }
+            return false;
+        } catch (final Exception e) {
+            return false;
+        }
+    }
+    
+    @EventHandler
+    public void PlayerCommand(final PlayerCommandPreprocessEvent event) {
+        final String message = event.getMessage();
+        if (message.toLowerCase().startsWith("/plotme")) {
+            final Plugin plotme = Bukkit.getPluginManager().getPlugin("PlotMe");
+            if (plotme == null) {
+                final Player player = event.getPlayer();
+                if (Settings.USE_PLOTME_ALIAS) {
+                    player.performCommand(message.replace("/plotme", "plots"));
+                } else {
+                    MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.NOT_USING_PLOTME);
+                }
+                event.setCancelled(true);
+            }
+        }
+    }
+    
+    @Override
+    public void onEnable() {
+        MAIN = new PlotSquared(this);
+        THIS = this;
+        if (Settings.METRICS) {
+            try {
+                final Metrics metrics = new Metrics(this);
+                metrics.start();
+                log(C.PREFIX.s() + "&6Metrics enabled.");
+            } catch (final Exception e) {
+                log(C.PREFIX.s() + "&cFailed to load up metrics.");
+            }
+        } else {
+            log("&dUsing metrics will allow us to improve the plugin, please consider it :)");
+        }
+        getServer().getPluginManager().registerEvents(this, this);
+    }
+    
+    @Override
+    public void onDisable() {
+        MAIN.disable();
+        MAIN = null;
+        THIS = null;
+    }
+    
+    @Override
+    public void log(String message) {
+        if ((THIS == null) || (Bukkit.getServer().getConsoleSender() == null)) {
+            System.out.println(ChatColor.stripColor(ConsoleColors.fromString(message)));
+        } else {
+            message = ChatColor.translateAlternateColorCodes('&', message);
+            if (!Settings.CONSOLE_COLOR) {
+                message = ChatColor.stripColor(message);
+            }
+            Bukkit.getServer().getConsoleSender().sendMessage(message);
+        }
+    }
+    
+    @Override
+    public void disable() {
+        onDisable();
+    }
+    
+    @Override
+    public String getVersion() {
+        return this.getDescription().getVersion();
+    }
+    
+    @Override
+    public void registerCommands() {
+        final MainCommand command = new MainCommand();
+        final BukkitCommand bcmd = new BukkitCommand();
+        final PluginCommand plotCommand = getCommand("plots");
+        plotCommand.setExecutor(bcmd);
+        plotCommand.setAliases(Arrays.asList("p", "ps", "plotme", "plot"));
+        plotCommand.setTabCompleter(bcmd);
+    }
+    
+    @Override
+    public File getDirectory() {
+        return getDataFolder();
+    }
+    
+    @Override
+    public TaskManager getTaskManager() {
+        return new BukkitTaskManager();
+    }
+    
+    @Override
+    public void runEntityTask() {
+        log(C.PREFIX.s() + "KillAllEntities started.");
+        TaskManager.runTaskRepeat(new Runnable() {
+            long ticked = 0l;
+            long error = 0l;
+            @Override
+            public void run() {
+                if (this.ticked > 36_000L) {
+                    this.ticked = 0l;
+                    if (this.error > 0) {
+                        log(C.PREFIX.s() + "KillAllEntities has been running for 6 hours. Errors: " + this.error);
+                    }
+                    this.error = 0l;
+                }
+                World world;
+                for (final String w : PlotSquared.getPlotWorlds()) {
+                    world = Bukkit.getWorld(w);
+                    try {
+                        if (world.getLoadedChunks().length < 1) {
+                            continue;
+                        }
+                        for (final Chunk chunk : world.getLoadedChunks()) {
+                            final Entity[] entities = chunk.getEntities();
+                            Entity entity;
+                            for (int i = entities.length - 1; i >= 0; i--) {
+                                if (!((entity = entities[i]) instanceof Player) && (MainUtil.getPlot(BukkitUtil.getLocation(entity)) == null)) {
+                                    entity.remove();
+                                }
+                            }
+                        }
+                    } catch (final Throwable e) {
+                        ++this.error;
+                    } finally {
+                        ++this.ticked;
+                    }
+                }
+            }
+        }, 20);
+    }
+    
+    @Override
+    final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
+        if (!PlotSquared.setupPlotWorld(world, id)) {
+            return null;
+        }
+        return new HybridGen(world);
+    }
+    
+    @Override
+    public void registerPlayerEvents() {
+        getServer().getPluginManager().registerEvents(new PlayerEvents(), this);
+        if (checkVersion(1, 8, 0)) {
+            getServer().getPluginManager().registerEvents(new PlayerEvents_1_8(), this);
+        }
+    }
+    
+    @Override
+    public void registerInventoryEvents() {
+        getServer().getPluginManager().registerEvents(new InventoryListener(), this);
+    }
+    
+    @Override
+    public void registerPlotPlusEvents() {
+        PlotPlusListener.startRunnable(this);
+        getServer().getPluginManager().registerEvents(new PlotPlusListener(), this);
+    }
+    
+    @Override
+    public void registerForceFieldEvents() {
+        getServer().getPluginManager().registerEvents(new ForceFieldListener(), this);
+    }
+    
+    @Override
+    public void registerWorldEditEvents() {
+        if (getServer().getPluginManager().getPlugin("WorldEdit") != null) {
+            PlotSquared.worldEdit = (WorldEditPlugin) getServer().getPluginManager().getPlugin("WorldEdit");
+            final String version = PlotSquared.worldEdit.getDescription().getVersion();
+            if ((version != null) && version.startsWith("5.")) {
+                log("&cThis version of WorldEdit does not support PlotSquared.");
+                log("&cPlease use WorldEdit 6+ for masking support");
+                log("&c - http://builds.enginehub.org/job/worldedit");
+            } else {
+                getServer().getPluginManager().registerEvents(new WorldEditListener(), this);
+                MainCommand.subCommands.add(new WE_Anywhere());
+            }
+        }
+    }
+    
+    @Override
+    public Economy getEconomy() {
+        if ((getServer().getPluginManager().getPlugin("Vault") != null) && getServer().getPluginManager().getPlugin("Vault").isEnabled()) {
+            final RegisteredServiceProvider<Economy> economyProvider = getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
+            if (economyProvider != null) {
+                MainCommand.subCommands.add(new Buy());
+                return economyProvider.getProvider();
+            }
+        }
+        return null;
+    }
+    
+    @Override
+    public BlockManager initBlockManager() {
+        if (checkVersion(1, 8, 0)) {
+            try {
+                SetBlockManager.setBlockManager = new SetBlockFast_1_8();
+            } catch (final Throwable e) {
+                e.printStackTrace();
+                SetBlockManager.setBlockManager = new SetBlockSlow();
+            }
+        } else {
+            try {
+                SetBlockManager.setBlockManager = new SetBlockFast();
+            } catch (final Throwable e) {
+                SetBlockManager.setBlockManager = new SetBlockSlow();
+            }
+        }
+        try {
+            new SendChunk();
+            MainUtil.canSendChunk = true;
+        } catch (final Throwable e) {
+            MainUtil.canSendChunk = false;
+        }
+        return BlockManager.manager = new BukkitUtil();
+    }
+    
+    @Override
+    public boolean initPlotMeConverter() {
+        try {
+            new PlotMeConverter().runAsync();
+        } catch (final Exception e) {
+            e.printStackTrace();
+        }
+        if (Bukkit.getPluginManager().getPlugin("PlotMe") != null) {
+            return true;
+        }
+        return false;
+    }
+    
+    @Override
+    public void getGenerator(final String world, final String name) {
+        final Plugin gen_plugin = Bukkit.getPluginManager().getPlugin(name);
+        if ((gen_plugin != null) && gen_plugin.isEnabled()) {
+            gen_plugin.getDefaultWorldGenerator(world, "");
+        } else {
+            new HybridGen(world);
+        }
+    }
+    
+    @Override
+    public boolean callRemovePlot(final String world, final PlotId id) {
+        final PlotDeleteEvent event = new PlotDeleteEvent(world, id);
+        Bukkit.getServer().getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            event.setCancelled(true);
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public HybridUtils initHybridUtils() {
+        return new BukkitHybridUtils();
+    }
+
+    @Override
+    public SetupUtils initSetupUtils() {
+        return new BukkitSetupUtils();
+    }
+}

PlotSquared/src/main/java/com/intellectualcrafters/plot/IPlotMain.java

@@ -0,0 +1,51 @@
+package com.intellectualcrafters.plot;
+
+import java.io.File;
+
+import net.milkbowl.vault.economy.Economy;
+
+import com.intellectualcrafters.plot.generator.HybridUtils;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.SetupUtils;
+import com.intellectualcrafters.plot.util.TaskManager;
+
+public interface IPlotMain {
+    public void log(String message);
+    
+    public File getDirectory();
+    
+    public void disable();
+    
+    public String getVersion();
+    
+    public TaskManager getTaskManager();
+    
+    public void runEntityTask();
+    
+    public void registerCommands();
+    
+    public void registerPlayerEvents();
+    
+    public void registerInventoryEvents();
+    
+    public void registerPlotPlusEvents();
+    
+    public void registerForceFieldEvents();
+    
+    public void registerWorldEditEvents();
+    
+    public Economy getEconomy();
+    
+    public BlockManager initBlockManager();
+    
+    public SetupUtils initSetupUtils();
+    
+    public HybridUtils initHybridUtils();
+    
+    public boolean initPlotMeConverter();
+    
+    public void getGenerator(String world, String name);
+    
+    public boolean callRemovePlot(String world, PlotId id);
+}

PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java

@@ -0,0 +1,836 @@
+package com.intellectualcrafters.plot;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+
+import net.milkbowl.vault.economy.Economy;
+
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import com.intellectualcrafters.plot.commands.Cluster;
+import com.intellectualcrafters.plot.commands.MainCommand;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.Configuration;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.database.MySQL;
+import com.intellectualcrafters.plot.database.SQLManager;
+import com.intellectualcrafters.plot.database.SQLite;
+import com.intellectualcrafters.plot.flag.AbstractFlag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.flag.FlagValue;
+import com.intellectualcrafters.plot.generator.AugmentedPopulator;
+import com.intellectualcrafters.plot.generator.ClassicPlotWorld;
+import com.intellectualcrafters.plot.generator.HybridGen;
+import com.intellectualcrafters.plot.generator.HybridPlotWorld;
+import com.intellectualcrafters.plot.generator.HybridUtils;
+import com.intellectualcrafters.plot.generator.SquarePlotManager;
+import com.intellectualcrafters.plot.generator.SquarePlotWorld;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.object.PlotCluster;
+import com.intellectualcrafters.plot.object.PlotGenerator;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ClusterManager;
+import com.intellectualcrafters.plot.util.ExpireManager;
+import com.intellectualcrafters.plot.util.Logger;
+import com.intellectualcrafters.plot.util.SetupUtils;
+import com.intellectualcrafters.plot.util.Logger.LogLevel;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+
+public class PlotSquared {
+    public static final String MAIN_PERMISSION = "plots.use";
+    public static final String ADMIN_PERMISSION = "plots.admin";
+    public static File styleFile;
+    public static YamlConfiguration style;
+    public static File configFile;
+    public static YamlConfiguration config;
+    public static File storageFile;
+    public static YamlConfiguration storage;
+    public static PlotSquared THIS = null; // This class
+    public static IPlotMain IMP = null; // Specific implementation of PlotSquared
+    public static String VERSION = null;
+    public static TaskManager TASK = null;
+    private static boolean LOADING_WORLD = false;
+    public static Economy economy = null;
+    public static WorldEditPlugin worldEdit = null;
+    private final static HashMap<String, PlotWorld> plotworlds = new HashMap<>();
+    private final static HashMap<String, PlotManager> plotmanagers = new HashMap<>();
+    private static LinkedHashMap<String, HashMap<PlotId, Plot>> plots;
+    private static MySQL mySQL;
+    public static Connection connection;
+    
+    public static MySQL getMySQL() {
+        return mySQL;
+    }
+    
+    public static void updatePlot(final Plot plot) {
+        final String world = plot.world;
+        if (!plots.containsKey(world)) {
+            plots.put(world, new HashMap<PlotId, Plot>());
+        }
+        plot.hasChanged = true;
+        plots.get(world).put(plot.id, plot);
+    }
+    
+    public static PlotWorld getPlotWorld(final String world) {
+        if (plotworlds.containsKey(world)) {
+            return plotworlds.get(world);
+        }
+        return null;
+    }
+    
+    public static void addPlotWorld(final String world, final PlotWorld plotworld, final PlotManager manager) {
+        plotworlds.put(world, plotworld);
+        plotmanagers.put(world, manager);
+        if (!plots.containsKey(world)) {
+            plots.put(world, new HashMap<PlotId, Plot>());
+        }
+    }
+    
+    public static void removePlotWorld(final String world) {
+        plots.remove(world);
+        plotmanagers.remove(world);
+        plotworlds.remove(world);
+    }
+    
+    public static HashMap<String, HashMap<PlotId, Plot>> getAllPlotsRaw() {
+        return plots;
+    }
+    
+    public static void setAllPlotsRaw(final LinkedHashMap<String, HashMap<PlotId, Plot>> plots) {
+        PlotSquared.plots = plots;
+    }
+    
+    public static Set<Plot> getPlots() {
+        final ArrayList<Plot> newplots = new ArrayList<>();
+        for (final HashMap<PlotId, Plot> world : plots.values()) {
+            newplots.addAll(world.values());
+        }
+        return new LinkedHashSet<>(newplots);
+    }
+    
+    public static LinkedHashSet<Plot> getPlotsSorted() {
+        final ArrayList<Plot> newplots = new ArrayList<>();
+        for (final HashMap<PlotId, Plot> world : plots.values()) {
+            newplots.addAll(world.values());
+        }
+        return new LinkedHashSet<>(newplots);
+    }
+    
+    public static Set<Plot> getPlots(final String world, final String player) {
+        final UUID uuid = UUIDHandler.getUUID(player);
+        return getPlots(world, uuid);
+    }
+    
+    public static Set<Plot> getPlots(final String world, final PlotPlayer player) {
+        final UUID uuid = player.getUUID();
+        return getPlots(world, uuid);
+    }
+    
+    public static Set<Plot> getPlots(final String world, final UUID uuid) {
+        final ArrayList<Plot> myplots = new ArrayList<>();
+        for (final Plot plot : getPlots(world).values()) {
+            if (plot.hasOwner()) {
+                if (plot.getOwner().equals(uuid)) {
+                    myplots.add(plot);
+                }
+            }
+        }
+        return new HashSet<>(myplots);
+    }
+    
+    public static boolean isPlotWorld(final String world) {
+        return (plotworlds.containsKey(world));
+    }
+    
+    public static PlotManager getPlotManager(final String world) {
+        if (plotmanagers.containsKey(world)) {
+            return plotmanagers.get(world);
+        }
+        return null;
+    }
+    
+    public static String[] getPlotWorldsString() {
+        final Set<String> strings = plots.keySet();
+        return strings.toArray(new String[strings.size()]);
+    }
+    
+    public static HashMap<PlotId, Plot> getPlots(final String world) {
+        if (plots.containsKey(world)) {
+            return plots.get(world);
+        }
+        return new HashMap<>();
+    }
+    
+    public static Set<Plot> getPlots(final PlotPlayer player) {
+        final UUID uuid = player.getUUID();
+        final ArrayList<Plot> myplots = new ArrayList<>();
+        for (final String world : plots.keySet()) {
+            if (isPlotWorld(world)) {
+                for (final Plot plot : plots.get(world).values()) {
+                    if (plot.hasOwner()) {
+                        if (plot.getOwner().equals(uuid)) {
+                            myplots.add(plot);
+                        }
+                    }
+                }
+            }
+        }
+        return new HashSet<>(myplots);
+    }
+    
+    public static boolean removePlot(final String world, final PlotId id, final boolean callEvent) {
+        if (callEvent) {
+            if (!IMP.callRemovePlot(world, id)) {
+                return false;
+            }
+        }
+        plots.get(world).remove(id);
+        if (MainUtil.lastPlot.containsKey(world)) {
+            final PlotId last = MainUtil.lastPlot.get(world);
+            final int last_max = Math.max(last.x, last.y);
+            final int this_max = Math.max(id.x, id.y);
+            if (this_max < last_max) {
+                MainUtil.lastPlot.put(world, id);
+            }
+        }
+        return true;
+    }
+    
+    public static void loadWorld(final String world, final PlotGenerator generator) {
+        if (getPlotWorld(world) != null) {
+            return;
+        }
+        final Set<String> worlds = (config.contains("worlds") ? config.getConfigurationSection("worlds").getKeys(false) : new HashSet<String>());
+        final PlotWorld plotWorld;
+        final PlotGenerator plotGenerator;
+        final PlotManager plotManager;
+        final String path = "worlds." + world;
+        if (!LOADING_WORLD && (generator != null) && (generator instanceof PlotGenerator)) {
+            plotGenerator = generator;
+            plotWorld = plotGenerator.getNewPlotWorld(world);
+            plotManager = plotGenerator.getPlotManager();
+            if (!world.equals("CheckingPlotSquaredGenerator")) {
+                log(C.PREFIX.s() + "&aDetected world load for '" + world + "'");
+                log(C.PREFIX.s() + "&3 - generator: &7" + plotGenerator.getClass().getName());
+                log(C.PREFIX.s() + "&3 - plotworld: &7" + plotWorld.getClass().getName());
+                log(C.PREFIX.s() + "&3 - manager: &7" + plotManager.getClass().getName());
+            }
+            if (!config.contains(path)) {
+                config.createSection(path);
+            }
+            plotWorld.saveConfiguration(config.getConfigurationSection(path));
+            plotWorld.loadDefaultConfiguration(config.getConfigurationSection(path));
+            try {
+                config.save(configFile);
+            } catch (final IOException e) {
+                e.printStackTrace();
+            }
+            // Now add it
+            addPlotWorld(world, plotWorld, plotManager);
+            MainUtil.setupBorder(world);
+        } else {
+            if (!worlds.contains(world)) {
+                return;
+            }
+            if (!LOADING_WORLD) {
+                LOADING_WORLD = true;
+                try {
+                    final String gen_string = config.getString("worlds." + world + "." + "generator.plugin");
+                    if (gen_string == null) {
+                        new HybridGen(world);
+                    } else {
+                        IMP.getGenerator(world, gen_string);
+                    }
+                } catch (final Exception e) {
+                    log("&d=== Oh no! Please set the generator for the " + world + " ===");
+                    e.printStackTrace();
+                    LOADING_WORLD = false;
+                    removePlotWorld(world);
+                } finally {
+                    LOADING_WORLD = false;
+                }
+            } else {
+                final PlotGenerator gen_class = generator;
+                plotWorld = gen_class.getNewPlotWorld(world);
+                plotManager = gen_class.getPlotManager();
+                if (!config.contains(path)) {
+                    config.createSection(path);
+                }
+                plotWorld.TYPE = 2;
+                plotWorld.TERRAIN = 0;
+                plotWorld.saveConfiguration(config.getConfigurationSection(path));
+                plotWorld.loadDefaultConfiguration(config.getConfigurationSection(path));
+                try {
+                    config.save(configFile);
+                } catch (final IOException e) {
+                    e.printStackTrace();
+                }
+                if (((plotWorld.TYPE == 2) && !Settings.ENABLE_CLUSTERS) || !(plotManager instanceof SquarePlotManager)) {
+                    log("&c[ERROR] World '" + world + "' in settings.yml is not using PlotSquared generator! Please set the generator correctly or delete the world from the 'settings.yml'!");
+                    return;
+                }
+                addPlotWorld(world, plotWorld, plotManager);
+                if (plotWorld.TYPE == 2) {
+                    if (ClusterManager.getClusters(world).size() > 0) {
+                        for (final PlotCluster cluster : ClusterManager.getClusters(world)) {
+                            new AugmentedPopulator(world, gen_class, cluster, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
+                        }
+                    }
+                } else if (plotWorld.TYPE == 1) {
+                    new AugmentedPopulator(world, gen_class, null, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
+                }
+            }
+        }
+    }
+    
+    public static boolean setupPlotWorld(final String world, final String id) {
+        if ((id != null) && (id.length() > 0)) {
+            // save configuration
+            final String[] split = id.split(",");
+            final HybridPlotWorld plotworld = new HybridPlotWorld(world);
+            final int width = SquarePlotWorld.PLOT_WIDTH_DEFAULT;
+            final int gap = SquarePlotWorld.ROAD_WIDTH_DEFAULT;
+            final int height = ClassicPlotWorld.PLOT_HEIGHT_DEFAULT;
+            final PlotBlock[] floor = ClassicPlotWorld.TOP_BLOCK_DEFAULT;
+            final PlotBlock[] main = ClassicPlotWorld.MAIN_BLOCK_DEFAULT;
+            final PlotBlock wall = ClassicPlotWorld.WALL_FILLING_DEFAULT;
+            final PlotBlock border = ClassicPlotWorld.WALL_BLOCK_DEFAULT;
+            for (final String element : split) {
+                final String[] pair = element.split("=");
+                if (pair.length != 2) {
+                    log("&cNo value provided for: &7" + element);
+                    return false;
+                }
+                final String key = pair[0].toLowerCase();
+                final String value = pair[1];
+                try {
+                    switch (key) {
+                        case "s":
+                        case "size": {
+                            SquarePlotWorld.PLOT_WIDTH_DEFAULT = ((Integer) Configuration.INTEGER.parseString(value)).shortValue();
+                            break;
+                        }
+                        case "g":
+                        case "gap": {
+                            SquarePlotWorld.ROAD_WIDTH_DEFAULT = ((Integer) Configuration.INTEGER.parseString(value)).shortValue();
+                            break;
+                        }
+                        case "h":
+                        case "height": {
+                            ClassicPlotWorld.PLOT_HEIGHT_DEFAULT = (Integer) Configuration.INTEGER.parseString(value);
+                            ClassicPlotWorld.ROAD_HEIGHT_DEFAULT = (Integer) Configuration.INTEGER.parseString(value);
+                            ClassicPlotWorld.WALL_HEIGHT_DEFAULT = (Integer) Configuration.INTEGER.parseString(value);
+                            break;
+                        }
+                        case "f":
+                        case "floor": {
+                            ClassicPlotWorld.TOP_BLOCK_DEFAULT = (PlotBlock[]) Configuration.BLOCKLIST.parseString(value);
+                            break;
+                        }
+                        case "m":
+                        case "main": {
+                            ClassicPlotWorld.MAIN_BLOCK_DEFAULT = (PlotBlock[]) Configuration.BLOCKLIST.parseString(value);
+                            break;
+                        }
+                        case "w":
+                        case "wall": {
+                            ClassicPlotWorld.WALL_FILLING_DEFAULT = (PlotBlock) Configuration.BLOCK.parseString(value);
+                            break;
+                        }
+                        case "b":
+                        case "border": {
+                            ClassicPlotWorld.WALL_BLOCK_DEFAULT = (PlotBlock) Configuration.BLOCK.parseString(value);
+                            break;
+                        }
+                        default: {
+                            log("&cKey not found: &7" + element);
+                            return false;
+                        }
+                    }
+                } catch (final Exception e) {
+                    e.printStackTrace();
+                    log("&cInvalid value: &7" + value + " in arg " + element);
+                    return false;
+                }
+            }
+            try {
+                final String root = "worlds." + world;
+                if (!config.contains(root)) {
+                    config.createSection(root);
+                }
+                plotworld.saveConfiguration(config.getConfigurationSection(root));
+                ClassicPlotWorld.PLOT_HEIGHT_DEFAULT = height;
+                ClassicPlotWorld.ROAD_HEIGHT_DEFAULT = height;
+                ClassicPlotWorld.WALL_HEIGHT_DEFAULT = height;
+                ClassicPlotWorld.TOP_BLOCK_DEFAULT = floor;
+                ClassicPlotWorld.MAIN_BLOCK_DEFAULT = main;
+                ClassicPlotWorld.WALL_BLOCK_DEFAULT = border;
+                ClassicPlotWorld.WALL_FILLING_DEFAULT = wall;
+                SquarePlotWorld.PLOT_WIDTH_DEFAULT = width;
+                SquarePlotWorld.ROAD_WIDTH_DEFAULT = gap;
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return true;
+    }
+    
+    public static Connection getConnection() {
+        return connection;
+    }
+    
+    public PlotSquared(final IPlotMain imp_class) {
+        THIS = this;
+        IMP = imp_class;
+        VERSION = IMP.getVersion();
+        economy = IMP.getEconomy();
+        C.setupTranslations();
+        C.saveTranslations();
+        if (getJavaVersion() < 1.7) {
+            log(C.PREFIX.s() + "&cYour java version is outdated. Please update to at least 1.7.");
+            // Didn't know of any other link :D
+            log(C.PREFIX.s() + "&cURL: &6https://java.com/en/download/index.jsp");
+            IMP.disable();
+            return;
+        }
+        if (getJavaVersion() < 1.8) {
+            log(C.PREFIX.s() + "&cIt's really recommended to run Java 1.8, as it increases performance");
+        }
+        TASK = IMP.getTaskManager();
+        if (Settings.KILL_ROAD_MOBS) {
+            IMP.runEntityTask();
+        }
+        if (C.ENABLED.s().length() > 0) {
+            log(C.ENABLED.s());
+        }
+        setupConfigs();
+        setupDefaultFlags();
+        setupDatabase();
+        // Events
+        IMP.registerCommands();
+        IMP.registerPlayerEvents();
+        IMP.registerInventoryEvents();
+        IMP.registerPlotPlusEvents();
+        IMP.registerForceFieldEvents();
+        IMP.registerWorldEditEvents();
+        // create Hybrid utility class
+        HybridUtils.manager = IMP.initHybridUtils();
+        // create setup util class
+        SetupUtils.manager = IMP.initSetupUtils();
+        // Set block
+        BlockManager.manager = IMP.initBlockManager();
+        // PlotMe
+        TaskManager.runTaskLater(new Runnable() {
+            @Override
+            public void run() {
+                if (IMP.initPlotMeConverter()) {
+                    log("&c=== IMPORTANT ===");
+                    log("&cTHIS MESSAGE MAY BE EXTREMELY HELPFUL IF YOU HAVE TROUBLE CONVERTING PLOTME!");
+                    log("&c - Make sure 'UUID.read-from-disk' is disabled (false)!");
+                    log("&c - Sometimes the database can be locked, deleting PlotMe.jar beforehand will fix the issue!");
+                    log("&c - After the conversion is finished, please set 'plotme-convert.enabled' to false in the 'settings.yml@'");
+                }
+            }
+        }, 200);
+        if (Settings.AUTO_CLEAR) {
+            ExpireManager.runTask();
+        }
+    }
+    
+    public void disable() {
+        try {
+            connection.close();
+            mySQL.closeConnection();
+        } catch (NullPointerException | SQLException e) {
+            if (connection != null) {
+                log("&cCould not close mysql connection!");
+            }
+        }
+    }
+    
+    public static void log(final String message) {
+        IMP.log(message);
+    }
+    
+    public void setupDatabase() {
+        final String[] tables;
+        if (Settings.ENABLE_CLUSTERS) {
+            MainCommand.subCommands.add(new Cluster());
+            tables = new String[] { "plot_trusted", "plot_ratings", "plot_comments", "cluster" };
+        } else {
+            tables = new String[] { "plot_trusted", "plot_ratings", "plot_comments" };
+        }
+        if (Settings.DB.USE_MYSQL) {
+            try {
+                mySQL = new MySQL(THIS, Settings.DB.HOST_NAME, Settings.DB.PORT, Settings.DB.DATABASE, Settings.DB.USER, Settings.DB.PASSWORD);
+                connection = mySQL.openConnection();
+                {
+                    if (DBFunc.dbManager == null) {
+                        DBFunc.dbManager = new SQLManager(connection, Settings.DB.PREFIX);
+                    }
+                    final DatabaseMetaData meta = connection.getMetaData();
+                    ResultSet res = meta.getTables(null, null, Settings.DB.PREFIX + "plot", null);
+                    if (!res.next()) {
+                        DBFunc.createTables("mysql", true);
+                    } else {
+                        for (final String table : tables) {
+                            res = meta.getTables(null, null, Settings.DB.PREFIX + table, null);
+                            if (!res.next()) {
+                                DBFunc.createTables("mysql", false);
+                            }
+                        }
+                    }
+                }
+            } catch (final Exception e) {
+                log("&c[Plots] MySQL is not setup correctly. The plugin will disable itself.");
+                if ((config == null) || config.getBoolean("debug")) {
+                    log("&d==== Here is an ugly stacktrace if you are interested in those things ====");
+                    e.printStackTrace();
+                    log("&d==== End of stacktrace ====");
+                    log("&6Please go to the PlotSquared 'storage.yml' and configure MySQL correctly.");
+                }
+                IMP.disable();
+                return;
+            }
+            plots = DBFunc.getPlots();
+            if (Settings.ENABLE_CLUSTERS) {
+                ClusterManager.clusters = DBFunc.getClusters();
+            }
+        } else if (Settings.DB.USE_MONGO) {
+            // DBFunc.dbManager = new MongoManager();
+            log(C.PREFIX.s() + "MongoDB is not yet implemented");
+        } else if (Settings.DB.USE_SQLITE) {
+            try {
+                connection = new SQLite(THIS, IMP.getDirectory() + File.separator + Settings.DB.SQLITE_DB + ".db").openConnection();
+                {
+                    DBFunc.dbManager = new SQLManager(connection, Settings.DB.PREFIX);
+                    final DatabaseMetaData meta = connection.getMetaData();
+                    ResultSet res = meta.getTables(null, null, Settings.DB.PREFIX + "plot", null);
+                    if (!res.next()) {
+                        DBFunc.createTables("sqlite", true);
+                    } else {
+                        for (final String table : tables) {
+                            res = meta.getTables(null, null, Settings.DB.PREFIX + table, null);
+                            if (!res.next()) {
+                                DBFunc.createTables("sqlite", false);
+                            }
+                        }
+                    }
+                }
+            } catch (final Exception e) {
+                log(C.PREFIX.s() + "&cFailed to open SQLite connection. The plugin will disable itself.");
+                log("&9==== Here is an ugly stacktrace, if you are interested in those things ===");
+                e.printStackTrace();
+                IMP.disable();
+                return;
+            }
+            plots = DBFunc.getPlots();
+            if (Settings.ENABLE_CLUSTERS) {
+                ClusterManager.clusters = DBFunc.getClusters();
+            }
+        } else {
+            log(C.PREFIX + "&cNo storage type is set!");
+            IMP.disable();
+            return;
+        }
+    }
+    
+    public static void setupDefaultFlags() {
+        final List<String> booleanFlags = Arrays.asList("notify-enter", "notify-leave", "item-drop", "invincible", "instabreak", "drop-protection", "forcefield", "titles", "pve", "pvp", "no-worldedit");
+        final List<String> intervalFlags = Arrays.asList("feed", "heal");
+        final List<String> stringFlags = Arrays.asList("greeting", "farewell");
+        for (final String flag : stringFlags) {
+            FlagManager.addFlag(new AbstractFlag(flag));
+        }
+        for (final String flag : intervalFlags) {
+            FlagManager.addFlag(new AbstractFlag(flag, new FlagValue.IntervalValue()));
+        }
+        for (final String flag : booleanFlags) {
+            FlagManager.addFlag(new AbstractFlag(flag, new FlagValue.BooleanValue()));
+        }
+        FlagManager.addFlag(new AbstractFlag("fly", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("explosion", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("hostile-interact", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("hostile-attack", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("animal-interact", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("animal-attack", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("tamed-interact", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("tamed-attack", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("misc-interact", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("hanging-place", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("hanging-break", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("vehicle-use", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("vehicle-place", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("vehicle-break", new FlagValue.BooleanValue()));
+        FlagManager.addFlag(new AbstractFlag("place", new FlagValue.PlotBlockListValue()));
+        FlagManager.addFlag(new AbstractFlag("break", new FlagValue.PlotBlockListValue()));
+        FlagManager.addFlag(new AbstractFlag("use", new FlagValue.PlotBlockListValue()));
+        FlagManager.addFlag(new AbstractFlag("gamemode") {
+            @Override
+            public String parseValueRaw(final String value) {
+                switch (value) {
+                    case "creative":
+                    case "c":
+                    case "1":
+                        return "creative";
+                    case "survival":
+                    case "s":
+                    case "0":
+                        return "survival";
+                    case "adventure":
+                    case "a":
+                    case "2":
+                        return "adventure";
+                    default:
+                        return null;
+                }
+            }
+            
+            @Override
+            public String getValueDesc() {
+                return "Flag value must be a gamemode: 'creative' , 'survival' or 'adventure'";
+            }
+        });
+        FlagManager.addFlag(new AbstractFlag("price", new FlagValue.UnsignedDoubleValue()));
+        FlagManager.addFlag(new AbstractFlag("time", new FlagValue.LongValue()));
+        FlagManager.addFlag(new AbstractFlag("weather") {
+            @Override
+            public String parseValueRaw(final String value) {
+                switch (value) {
+                    case "rain":
+                    case "storm":
+                    case "on":
+                        return "rain";
+                    case "clear":
+                    case "off":
+                    case "sun":
+                        return "clear";
+                    default:
+                        return null;
+                }
+            }
+            
+            @Override
+            public String getValueDesc() {
+                return "Flag value must be weather type: 'clear' or 'rain'";
+            }
+        });
+    }
+    
+    public static void setupConfig() {
+        config.set("version", VERSION);
+        final Map<String, Object> options = new HashMap<>();
+        options.put("teleport.delay", 0);
+        options.put("auto_update", false);
+        options.put("clusters.enabled", Settings.ENABLE_CLUSTERS);
+        options.put("plotme-alias", Settings.USE_PLOTME_ALIAS);
+        options.put("plotme-convert.enabled", Settings.CONVERT_PLOTME);
+        options.put("claim.max-auto-area", Settings.MAX_AUTO_SIZE);
+        options.put("UUID.offline", Settings.OFFLINE_MODE);
+        options.put("kill_road_mobs", Settings.KILL_ROAD_MOBS_DEFAULT);
+        options.put("mob_pathfinding", Settings.MOB_PATHFINDING_DEFAULT);
+        options.put("console.color", Settings.CONSOLE_COLOR);
+        options.put("metrics", true);
+        options.put("debug", true);
+        options.put("clear.auto.enabled", false);
+        options.put("clear.auto.days", 365);
+        options.put("clear.check-disk", Settings.AUTO_CLEAR_CHECK_DISK);
+        options.put("clear.on.ban", false);
+        options.put("max_plots", Settings.MAX_PLOTS);
+        options.put("schematics.save_path", Settings.SCHEMATIC_SAVE_PATH);
+        options.put("uuid.read-from-disk", Settings.UUID_FROM_DISK);
+        options.put("titles", Settings.TITLES);
+        options.put("teleport.on_login", Settings.TELEPORT_ON_LOGIN);
+        options.put("worldedit.require-selection-in-mask", Settings.REQUIRE_SELECTION);
+        for (final Entry<String, Object> node : options.entrySet()) {
+            if (!config.contains(node.getKey())) {
+                config.set(node.getKey(), node.getValue());
+            }
+        }
+        Settings.ENABLE_CLUSTERS = config.getBoolean("clusters.enabled");
+        Settings.DEBUG = config.getBoolean("debug");
+        if (Settings.DEBUG) {
+            log(C.PREFIX.s() + "&6Debug Mode Enabled (Default). Edit the config to turn this off.");
+        }
+        Settings.TELEPORT_DELAY = config.getInt("teleport.delay");
+        Settings.CONSOLE_COLOR = config.getBoolean("console.color");
+        Settings.TELEPORT_ON_LOGIN = config.getBoolean("teleport.on_login");
+        Settings.USE_PLOTME_ALIAS = config.getBoolean("plotme-alias");
+        Settings.CONVERT_PLOTME = config.getBoolean("plotme-convert.enabled");
+        Settings.KILL_ROAD_MOBS = config.getBoolean("kill_road_mobs");
+        Settings.MOB_PATHFINDING = config.getBoolean("mob_pathf" + "inding");
+        Settings.METRICS = config.getBoolean("metrics");
+        Settings.AUTO_CLEAR_DAYS = config.getInt("clear.auto.days");
+        Settings.AUTO_CLEAR_CHECK_DISK = config.getBoolean("clear.check-disk");
+        Settings.MAX_AUTO_SIZE = config.getInt("claim.max-auto-area");
+        Settings.AUTO_CLEAR = config.getBoolean("clear.auto.enabled");
+        Settings.TITLES = config.getBoolean("titles");
+        Settings.MAX_PLOTS = config.getInt("max_plots");
+        if (Settings.MAX_PLOTS > 32767) {
+            log("&c`max_plots` Is set too high! This is a per player setting and does not need to be very large.");
+            Settings.MAX_PLOTS = 32767;
+        }
+        Settings.SCHEMATIC_SAVE_PATH = config.getString("schematics.save_path");
+        Settings.OFFLINE_MODE = config.getBoolean("UUID.offline");
+        Settings.UUID_FROM_DISK = config.getBoolean("uuid.read-from-disk");
+        Settings.REQUIRE_SELECTION = config.getBoolean("worldedit.require-selection-in-mask");
+    }
+    
+    public static void setupConfigs() {
+        final File folder = new File(IMP.getDirectory() + File.separator + "config");
+        if (!folder.exists() && !folder.mkdirs()) {
+            log(C.PREFIX.s() + "&cFailed to create the /plugins/config folder. Please create it manually.");
+        }
+        try {
+            styleFile = new File(IMP.getDirectory() + File.separator + "translations" + File.separator + "style.yml");
+            if (!styleFile.exists()) {
+                if (!styleFile.createNewFile()) {
+                    log("Could not create the style file, please create \"translations/style.yml\" manually");
+                }
+            }
+            style = YamlConfiguration.loadConfiguration(styleFile);
+            setupStyle();
+        } catch (final Exception err) {
+            Logger.add(LogLevel.DANGER, "Failed to save style.yml");
+            System.out.println("failed to save style.yml");
+        }
+        try {
+            configFile = new File(IMP.getDirectory() + File.separator + "config" + File.separator + "settings.yml");
+            if (!configFile.exists()) {
+                if (!configFile.createNewFile()) {
+                    log("Could not create the settings file, please create \"settings.yml\" manually.");
+                }
+            }
+            config = YamlConfiguration.loadConfiguration(configFile);
+            setupConfig();
+        } catch (final Exception err_trans) {
+            Logger.add(LogLevel.DANGER, "Failed to save settings.yml");
+            System.out.println("Failed to save settings.yml");
+        }
+        try {
+            storageFile = new File(IMP.getDirectory() + File.separator + "config" + File.separator + "storage.yml");
+            if (!storageFile.exists()) {
+                if (!storageFile.createNewFile()) {
+                    log("Could not the storage settings file, please create \"storage.yml\" manually.");
+                }
+            }
+            storage = YamlConfiguration.loadConfiguration(storageFile);
+            setupStorage();
+        } catch (final Exception err_trans) {
+            Logger.add(LogLevel.DANGER, "Failed to save storage.yml");
+            System.out.println("Failed to save storage.yml");
+        }
+        try {
+            style.save(styleFile);
+            config.save(configFile);
+            storage.save(storageFile);
+        } catch (final IOException e) {
+            Logger.add(LogLevel.DANGER, "Configuration file saving failed");
+            e.printStackTrace();
+        }
+    }
+    
+    private static void setupStorage() {
+        storage.set("version", VERSION);
+        final Map<String, Object> options = new HashMap<>();
+        options.put("mysql.use", false);
+        options.put("sqlite.use", true);
+        options.put("sqlite.db", "storage");
+        options.put("mysql.host", "localhost");
+        options.put("mysql.port", "3306");
+        options.put("mysql.user", "root");
+        options.put("mysql.password", "password");
+        options.put("mysql.database", "plot_db");
+        options.put("prefix", "");
+        for (final Entry<String, Object> node : options.entrySet()) {
+            if (!storage.contains(node.getKey())) {
+                storage.set(node.getKey(), node.getValue());
+            }
+        }
+    }
+    
+    public static void showDebug() {
+        Settings.DB.USE_MYSQL = storage.getBoolean("mysql.use");
+        Settings.DB.USER = storage.getString("mysql.user");
+        Settings.DB.PASSWORD = storage.getString("mysql.password");
+        Settings.DB.HOST_NAME = storage.getString("mysql.host");
+        Settings.DB.PORT = storage.getString("mysql.port");
+        Settings.DB.DATABASE = storage.getString("mysql.database");
+        Settings.DB.USE_SQLITE = storage.getBoolean("sqlite.use");
+        Settings.DB.SQLITE_DB = storage.getString("sqlite.db");
+        Settings.DB.PREFIX = storage.getString("prefix");
+        Settings.METRICS = config.getBoolean("metrics");
+        Settings.AUTO_CLEAR = config.getBoolean("clear.auto.enabled");
+        Settings.AUTO_CLEAR_DAYS = config.getInt("clear.auto.days");
+        Settings.DELETE_PLOTS_ON_BAN = config.getBoolean("clear.on.ban");
+        Settings.API_URL = config.getString("uuid.api.location");
+        Settings.CUSTOM_API = config.getBoolean("uuid.api.custom");
+        Settings.UUID_FECTHING = config.getBoolean("uuid.fetching");
+        C.COLOR_1 = "\u00A7" + (style.getString("color.1"));
+        C.COLOR_2 = "\u00A7" + (style.getString("color.2"));
+        C.COLOR_3 = "\u00A7" + (style.getString("color.3"));
+        C.COLOR_4 = "\u00A7" + (style.getString("color.4"));
+        if (Settings.DEBUG) {
+            final Map<String, String> settings = new HashMap<>();
+            settings.put("Kill Road Mobs", "" + Settings.KILL_ROAD_MOBS);
+            settings.put("Use Metrics", "" + Settings.METRICS);
+            settings.put("Delete Plots On Ban", "" + Settings.DELETE_PLOTS_ON_BAN);
+            settings.put("Mob Pathfinding", "" + Settings.MOB_PATHFINDING);
+            settings.put("DB Mysql Enabled", "" + Settings.DB.USE_MYSQL);
+            settings.put("DB SQLite Enabled", "" + Settings.DB.USE_SQLITE);
+            settings.put("Auto Clear Enabled", "" + Settings.AUTO_CLEAR);
+            settings.put("Auto Clear Days", "" + Settings.AUTO_CLEAR_DAYS);
+            settings.put("Schematics Save Path", "" + Settings.SCHEMATIC_SAVE_PATH);
+            settings.put("API Location", "" + Settings.API_URL);
+            for (final Entry<String, String> setting : settings.entrySet()) {
+                log(C.PREFIX.s() + String.format("&cKey: &6%s&c, Value: &6%s", setting.getKey(), setting.getValue()));
+            }
+        }
+    }
+    
+    private static void setupStyle() {
+        style.set("version", VERSION);
+        final Map<String, Object> o = new HashMap<>();
+        o.put("color.1", C.COLOR_1.substring(1));
+        o.put("color.2", C.COLOR_2.substring(1));
+        o.put("color.3", C.COLOR_3.substring(1));
+        o.put("color.4", C.COLOR_4.substring(1));
+        for (final Entry<String, Object> node : o.entrySet()) {
+            if (!style.contains(node.getKey())) {
+                style.set(node.getKey(), node.getValue());
+            }
+        }
+    }
+    
+    public static double getJavaVersion() {
+        return Double.parseDouble(System.getProperty("java.specification.version"));
+    }
+    
+    public static Set<String> getPlotWorlds() {
+        return plotworlds.keySet();
+    }
+}

PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java

@@ -1,651 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-package com.intellectualcrafters.plot.api;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.commands.MainCommand;
-import com.intellectualcrafters.plot.commands.SubCommand;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.flag.AbstractFlag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.PlotSquaredException;
-import com.intellectualcrafters.plot.util.SchematicHandler;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-
-/**
- * PlotSquared API
- *
- * @author Citymonstret
- * @author Empire92
- * @version API 2.0
- */
-
-@SuppressWarnings("unused") public class PlotAPI {
-
-    /**
-     * Permission that allows for admin access, this permission node will allow the player to use any part of the
-     * plugin, without limitations.
-     */
-    public static final String ADMIN_PERMISSION = "plots.admin";
-
-    /**
-     * Plot Helper Class
-     * <p/>
-     * General functions involving plots, and the management of them
-     *
-     * @see com.intellectualcrafters.plot.util.PlotHelper
-     */
-    private static PlotHelper plotHelper;
-
-    /**
-     * Player Functions
-     * <p/>
-     * General functions involving players, and plot worlds
-     *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions
-     */
-    private static PlayerFunctions playerFunctions;
-
-    /**
-     * Flag Manager
-     * <p/>
-     * The manager which handles all flags
-     *
-     * @see com.intellectualcrafters.plot.flag.FlagManager
-     */
-    private static FlagManager flagManager;
-
-    /**
-     * Schematic Handler
-     * <p/>
-     * The handler which is used to create, and paste, schematics
-     *
-     * @see com.intellectualcrafters.plot.util.SchematicHandler
-     */
-    private static SchematicHandler schematicHandler;
-
-    /**
-     * The translation class.
-     *
-     * @see com.intellectualcrafters.plot.config.C
-     */
-    private static C c;
-
-    /**
-     * PlotMain instance
-     * <p/>
-     * This is the instance that allows for most methods to be used.
-     *
-     * @see com.intellectualcrafters.plot.PlotMain
-     */
-    private final PlotMain plotMain;
-
-    /**
-     * Constructor. Insert any Plugin. (Optimally the plugin that is accessing the method)
-     *
-     * @param plugin Plugin used to access this method
-     *
-     * @throws com.intellectualcrafters.plot.util.PlotSquaredException if the program fails to fetch the PlotMain
-     *                                                                 instance
-     * @see com.intellectualcrafters.plot.PlotMain
-     */
-    public PlotAPI(final JavaPlugin plugin) {
-        this.plotMain = PlotMain.getMain();
-        if (this.plotMain == null) {
-            throw new PlotSquaredException(PlotSquaredException.PlotError.PLOTMAIN_NULL, "Failed to fetch the plotmain instance, Plot API for " + plugin.getName() + " will be disabled");
-        }
-    }
-
-    /**
-     * Get all plots
-     *
-     * @return all plots
-     *
-     * @see com.intellectualcrafters.plot.PlotMain#getPlots()
-     */
-    public Set<Plot> getAllPlots() {
-        return PlotMain.getPlots();
-    }
-
-    /**
-     * Return all plots for a player
-     *
-     * @param player Player, whose plots to search for
-     *
-     * @return all plots that a player owns
-     */
-    public Set<Plot> getPlayerPlots(final Player player) {
-        return PlotMain.getPlots(player);
-    }
-
-    /**
-     * Add a plot world
-     *
-     * @param world     World Name
-     * @param plotWorld Plot World Object
-     * @param manager   World Manager
-     *
-     * @see com.intellectualcrafters.plot.PlotMain#addPlotWorld(String, com.intellectualcrafters.plot.object.PlotWorld,
-     * com.intellectualcrafters.plot.object.PlotManager)
-     */
-    public void addPlotWorld(final String world, final PlotWorld plotWorld, final PlotManager manager) {
-        PlotMain.addPlotWorld(world, plotWorld, manager);
-    }
-
-    /**
-     * @return main configuration
-     *
-     * @see com.intellectualcrafters.plot.PlotMain#config
-     */
-    public YamlConfiguration getConfig() {
-        return PlotMain.config;
-    }
-
-    /**
-     * @return storage configuration
-     *
-     * @see com.intellectualcrafters.plot.PlotMain#storage
-     */
-    public YamlConfiguration getStorage() {
-        return PlotMain.storage;
-    }
-
-    /**
-     * Get the main class for this plugin <br> - Contains a lot of fields and methods - not very well organized <br>
-     * Only use this if you really need it
-     *
-     * @return PlotMain PlotSquared Main Class
-     *
-     * @see com.intellectualcrafters.plot.PlotMain
-     */
-    public PlotMain getMain() {
-        return this.plotMain;
-    }
-
-    /**
-     * PlotHelper class contains useful methods relating to plots.
-     *
-     * @return PlotHelper
-     *
-     * @see com.intellectualcrafters.plot.util.PlotHelper
-     */
-    public PlotHelper getPlotHelper() {
-        return plotHelper;
-    }
-
-    /**
-     * PlayerFunctions class contains useful methods relating to players - Some player/plot methods are here as well
-     *
-     * @return PlayerFunctions
-     *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions
-     */
-    public PlayerFunctions getPlayerFunctions() {
-        return playerFunctions;
-    }
-
-    /**
-     * FlagManager class contains methods relating to plot flags
-     *
-     * @return FlagManager
-     *
-     * @see com.intellectualcrafters.plot.flag.FlagManager
-     */
-    public FlagManager getFlagManager() {
-        return flagManager;
-    }
-
-    /**
-     * SchematicHandler class contains methods related to pasting schematics
-     *
-     * @return SchematicHandler
-     *
-     * @see com.intellectualcrafters.plot.util.SchematicHandler
-     */
-    public SchematicHandler getSchematicHandler() {
-        return schematicHandler;
-    }
-
-    /**
-     * C class contains all the captions from the translations.yml file.
-     *
-     * @return C
-     *
-     * @see com.intellectualcrafters.plot.config.C
-     */
-    public C getCaptions() {
-        return c;
-    }
-
-    /**
-     * Get the plot manager for a world. - Most of these methods can be accessed through the PlotHelper
-     *
-     * @param world Which manager to get
-     *
-     * @return PlotManager
-     *
-     * @see com.intellectualcrafters.plot.object.PlotManager
-     * @see PlotMain#getPlotManager(org.bukkit.World)
-     */
-    public PlotManager getPlotManager(final World world) {
-        return PlotMain.getPlotManager(world);
-    }
-
-    /**
-     * Get the plot manager for a world. - Contains useful low level methods for plot merging, clearing, and
-     * tessellation
-     *
-     * @param world Plot World
-     *
-     * @return PlotManager
-     *
-     * @see PlotMain#getPlotManager(String)
-     * @see com.intellectualcrafters.plot.object.PlotManager
-     */
-    public PlotManager getPlotManager(final String world) {
-        return PlotMain.getPlotManager(world);
-    }
-
-    /**
-     * Get the settings for a world (settings bundled in PlotWorld class) - You will need to downcast for the specific
-     * settings a Generator has. e.g. DefaultPlotWorld class implements PlotWorld
-     *
-     * @param world (to get settings of)
-     *
-     * @return PlotWorld class for that world ! will return null if not a plot world world
-     *
-     * @see PlotMain#getWorldSettings(org.bukkit.World)
-     * @see com.intellectualcrafters.plot.object.PlotWorld
-     */
-    public PlotWorld getWorldSettings(final World world) {
-        return PlotMain.getWorldSettings(world);
-    }
-
-    /**
-     * Get the settings for a world (settings bundled in PlotWorld class)
-     *
-     * @param world (to get settings of)
-     *
-     * @return PlotWorld class for that world ! will return null if not a plot world world
-     *
-     * @see PlotMain#getWorldSettings(String)
-     * @see com.intellectualcrafters.plot.object.PlotWorld
-     */
-    public PlotWorld getWorldSettings(final String world) {
-        return PlotMain.getWorldSettings(world);
-    }
-
-    /**
-     * Send a message to a player.
-     *
-     * @param player Player that will receive the message
-     * @param c      (Caption)
-     *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions#sendMessage(org.bukkit.entity.Player,
-     * com.intellectualcrafters.plot.config.C, String...)
-     */
-    public void sendMessage(final Player player, final C c) {
-        PlayerFunctions.sendMessage(player, c);
-    }
-
-    /**
-     * Send a message to a player. - Supports color codes
-     *
-     * @param player Player that will receive the message
-     * @param string The message
-     *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions#sendMessage(org.bukkit.entity.Player, String)
-     */
-    public void sendMessage(final Player player, final String string) {
-        PlayerFunctions.sendMessage(player, string);
-    }
-
-    /**
-     * Send a message to the console. - Supports color codes
-     *
-     * @param msg Message that should be sent to the console
-     *
-     * @see PlotMain#sendConsoleSenderMessage(String)
-     */
-    public void sendConsoleMessage(final String msg) {
-        PlotMain.sendConsoleSenderMessage(msg);
-    }
-
-    /**
-     * Send a message to the console
-     *
-     * @param c (Caption)
-     *
-     * @see #sendConsoleMessage(String)
-     * @see com.intellectualcrafters.plot.config.C
-     */
-    public void sendConsoleMessage(final C c) {
-        sendConsoleMessage(c.s());
-    }
-
-    /**
-     * Register a flag for use in plots
-     *
-     * @param flag Flag that should be registered
-     *
-     * @see com.intellectualcrafters.plot.flag.FlagManager#addFlag(com.intellectualcrafters.plot.flag.AbstractFlag)
-     * @see com.intellectualcrafters.plot.flag.AbstractFlag
-     */
-    public void addFlag(final AbstractFlag flag) {
-        FlagManager.addFlag(flag);
-    }
-
-    /**
-     * get all the currently registered flags
-     *
-     * @return array of Flag[]
-     *
-     * @see com.intellectualcrafters.plot.flag.FlagManager#getFlags()
-     * @see com.intellectualcrafters.plot.flag.AbstractFlag
-     */
-    public AbstractFlag[] getFlags() {
-        return FlagManager.getFlags().toArray(new AbstractFlag[FlagManager.getFlags().size()]);
-    }
-
-    /**
-     * Get a plot based on the ID
-     *
-     * @param world World in which the plot is located
-     * @param x     Plot Location X Co-ord
-     * @param z     Plot Location Z Co-ord
-     *
-     * @return plot, null if ID is wrong
-     *
-     * @see PlotHelper#getPlot(org.bukkit.World, com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot getPlot(final World world, final int x, final int z) {
-        return PlotHelper.getPlot(world, new PlotId(x, z));
-    }
-
-    /**
-     * Get a plot based on the location
-     *
-     * @param l The location that you want to to retrieve the plot from
-     *
-     * @return plot if found, otherwise it creates a temporary plot-
-     *
-     * @see PlotHelper#getCurrentPlot(org.bukkit.Location)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot getPlot(final Location l) {
-        return PlotHelper.getCurrentPlot(l);
-    }
-
-    /**
-     * Get a plot based on the player location
-     *
-     * @param player Get the current plot for the player location
-     *
-     * @return plot if found, otherwise it creates a temporary plot
-     *
-     * @see #getPlot(org.bukkit.Location)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot getPlot(final Player player) {
-        return this.getPlot(player.getLocation());
-    }
-
-    /**
-     * Check whether or not a player has a plot
-     *
-     * @param player Player that you want to check for
-     *
-     * @return true if player has a plot, false if not.
-     *
-     * @see #getPlots(org.bukkit.World, org.bukkit.entity.Player, boolean)
-     */
-    public boolean hasPlot(final World world, final Player player) {
-        return (getPlots(world, player, true) != null) && (getPlots(world, player, true).length > 0);
-    }
-
-    /**
-     * Get all plots for the player
-     *
-     * @param plr        to search for
-     * @param just_owner should we just search for owner? Or with rights?
-     *
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot[] getPlots(final World world, final Player plr, final boolean just_owner) {
-        final ArrayList<Plot> pPlots = new ArrayList<>();
-        for (final Plot plot : PlotMain.getPlots(world).values()) {
-            if (just_owner) {
-                if ((plot.owner != null) && (plot.owner == UUIDHandler.getUUID(plr))) {
-                    pPlots.add(plot);
-                }
-            } else {
-                if (plot.hasRights(plr)) {
-                    pPlots.add(plot);
-                }
-            }
-        }
-        return pPlots.toArray(new Plot[pPlots.size()]);
-    }
-
-    /**
-     * Get all plots for the world
-     *
-     * @param world to get plots of
-     *
-     * @return Plot[] - array of plot objects in world
-     *
-     * @see PlotMain#getWorldPlots(org.bukkit.World)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot[] getPlots(final World world) {
-        return PlotMain.getWorldPlots(world);
-    }
-
-    /**
-     * Get all plot worlds
-     *
-     * @return World[] - array of plot worlds
-     *
-     * @see com.intellectualcrafters.plot.PlotMain#getPlotWorlds()
-     */
-    public String[] getPlotWorlds() {
-        return PlotMain.getPlotWorlds();
-    }
-
-    /**
-     * Get if plot world
-     *
-     * @param world (to check if plot world)
-     *
-     * @return boolean (if plot world or not)
-     *
-     * @see com.intellectualcrafters.plot.PlotMain#isPlotWorld(org.bukkit.World)
-     */
-    public boolean isPlotWorld(final World world) {
-        return PlotMain.isPlotWorld(world);
-    }
-
-    /**
-     * Get plot locations
-     *
-     * @param p Plot that you want to get the locations for
-     *
-     * @return [0] = bottomLc, [1] = topLoc, [2] = home
-     *
-     * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotBottomLoc(org.bukkit.World,
-     * com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotTopLoc(org.bukkit.World,
-     * com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotHome(org.bukkit.World,
-     * com.intellectualcrafters.plot.object.Plot)
-     * @see com.intellectualcrafters.plot.object.PlotHomePosition
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Location[] getLocations(final Plot p) {
-        final World world = Bukkit.getWorld(p.world);
-        return new Location[]{PlotHelper.getPlotBottomLoc(world, p.id), PlotHelper.getPlotTopLoc(world, p.id), PlotHelper.getPlotHome(world, p.id)};
-    }
-
-    /**
-     * Get home location
-     *
-     * @param p Plot that you want to get the location for
-     *
-     * @return plot bottom location
-     *
-     * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotHome(org.bukkit.World,
-     * com.intellectualcrafters.plot.object.Plot)
-     * @see com.intellectualcrafters.plot.object.PlotHomePosition
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Location getHomeLocation(final Plot p) {
-        return PlotHelper.getPlotHome(p.getWorld(), p.id);
-    }
-
-    /**
-     * Get Bottom Location (min, min, min)
-     *
-     * @param p Plot that you want to get the location for
-     *
-     * @return plot bottom location
-     *
-     * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotBottomLoc(org.bukkit.World,
-     * com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Location getBottomLocation(final Plot p) {
-        final World world = Bukkit.getWorld(p.world);
-        return PlotHelper.getPlotBottomLoc(world, p.id);
-    }
-
-    /**
-     * Get Top Location (max, max, max)
-     *
-     * @param p Plot that you want to get the location for
-     *
-     * @return plot top location
-     *
-     * @see PlotHelper#getPlotTopLoc(org.bukkit.World, com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Location getTopLocation(final Plot p) {
-        final World world = Bukkit.getWorld(p.world);
-        return PlotHelper.getPlotTopLoc(world, p.id);
-    }
-
-    /**
-     * Check whether or not a player is in a plot
-     *
-     * @param player who we're checking for
-     *
-     * @return true if the player is in a plot, false if not-
-     *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions#isInPlot(org.bukkit.entity.Player)
-     */
-    public boolean isInPlot(final Player player) {
-        return PlayerFunctions.isInPlot(player);
-    }
-
-    /**
-     * Register a subcommand
-     *
-     * @param c SubCommand, that we want to register
-     *
-     * @see com.intellectualcrafters.plot.commands.MainCommand#subCommands
-     * @see com.intellectualcrafters.plot.commands.SubCommand
-     */
-    public void registerCommand(final SubCommand c) {
-        MainCommand.subCommands.add(c);
-    }
-
-    /**
-     * Get the plotMain class
-     *
-     * @return PlotMain Class
-     *
-     * @see com.intellectualcrafters.plot.PlotMain
-     */
-    public PlotMain getPlotMain() {
-        return this.plotMain;
-    }
-
-    /**
-     * Get the player plot count
-     *
-     * @param world  Specify the world we want to select the plots from
-     * @param player Player, for whom we're getting the plot count
-     *
-     * @return the number of plots the player has
-     *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions#getPlayerPlotCount(org.bukkit.World,
-     * org.bukkit.entity.Player)
-     */
-    public int getPlayerPlotCount(final World world, final Player player) {
-        return PlayerFunctions.getPlayerPlotCount(world, player);
-    }
-
-    /**
-     * Get a collection containing the players plots
-     *
-     * @param world  Specify the world we want to select the plots from
-     * @param player Player, for whom we're getting the plots
-     *
-     * @return a set containing the players plots
-     *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions#getPlayerPlots(org.bukkit.World,
-     * org.bukkit.entity.Player)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Set<Plot> getPlayerPlots(final World world, final Player player) {
-        return PlayerFunctions.getPlayerPlots(world, player);
-    }
-
-    /**
-     * Get the numbers of plots, which the player is able to build in
-     *
-     * @param player Player, for whom we're getting the plots (trusted, helper and owner)
-     *
-     * @return the number of allowed plots
-     *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions#getAllowedPlots(org.bukkit.entity.Player)
-     */
-    public int getAllowedPlots(final Player player) {
-        return PlayerFunctions.getAllowedPlots(player);
-    }
-}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java

@@ -18,26 +18,23 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import net.milkbowl.vault.economy.Economy;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotCluster;
 import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.ClusterManager;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.EconHandler;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
 
 public class Auto extends SubCommand {
     public Auto() {
@@ -75,32 +72,31 @@ public class Auto extends SubCommand {
     
     // TODO auto claim a mega plot with schematic
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        World world;
+        String world;
         int size_x = 1;
         int size_z = 1;
         String schematic = "";
-        if (PlotMain.getPlotWorlds().length == 1) {
+        if (PlotSquared.getPlotWorlds().size() == 1) {
-            world = Bukkit.getWorld(PlotMain.getPlotWorlds()[0]);
+            world = PlotSquared.getPlotWorlds().iterator().next();
         } else {
-            if (PlotMain.isPlotWorld(plr.getWorld())) {
+            world = plr.getLocation().getWorld();
-                world = plr.getWorld();
+            if (!PlotSquared.isPlotWorld(world)) {
-            } else {
+                MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
-                PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
                 return false;
             }
         }
         if (args.length > 0) {
-            if (PlotMain.hasPermission(plr, "plots.auto.mega")) {
+            if (Permissions.hasPermission(plr, "plots.auto.mega")) {
                 try {
                     final String[] split = args[0].split(",");
                     size_x = Integer.parseInt(split[0]);
                     size_z = Integer.parseInt(split[1]);
                     if ((size_x < 1) || (size_z < 1)) {
-                        PlayerFunctions.sendMessage(plr, "&cError: size<=0");
+                        MainUtil.sendMessage(plr, "&cError: size<=0");
                     }
                     if ((size_x > 4) || (size_z > 4)) {
-                        PlayerFunctions.sendMessage(plr, "&cError: size>4");
+                        MainUtil.sendMessage(plr, "&cError: size>4");
                     }
                     if (args.length > 1) {
                         schematic = args[1];
@@ -119,31 +115,31 @@ public class Auto extends SubCommand {
                 // return false;
             }
         }
-
         if ((size_x * size_z) > Settings.MAX_AUTO_SIZE) {
-            PlayerFunctions.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS_NUM, Settings.MAX_AUTO_SIZE + "");
+            MainUtil.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS_NUM, Settings.MAX_AUTO_SIZE + "");
             return false;
         }
-        final int diff = PlayerFunctions.getPlayerPlotCount(world, plr) - PlayerFunctions.getAllowedPlots(plr);
+        int currentPlots = MainUtil.getPlayerPlotCount(world, plr);
+        final int diff = currentPlots - MainUtil.getAllowedPlots(plr, currentPlots);
         if ((diff + (size_x * size_z)) > 0) {
             if (diff < 0) {
-                PlayerFunctions.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS_NUM, (-diff) + "");
+                MainUtil.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS_NUM, (-diff) + "");
             } else {
-                PlayerFunctions.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
+                MainUtil.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
             }
             return false;
         }
-        final PlotWorld pWorld = PlotMain.getWorldSettings(world);
+        final PlotWorld pWorld = PlotSquared.getPlotWorld(world);
-        if (PlotMain.useEconomy && pWorld.USE_ECONOMY) {
+        if ((PlotSquared.economy != null) && pWorld.USE_ECONOMY) {
             double cost = pWorld.PLOT_PRICE;
             cost = (size_x * size_z) * cost;
             if (cost > 0d) {
-                final Economy economy = PlotMain.economy;
+                final Economy economy = PlotSquared.economy;
-                if (economy.getBalance(plr) < cost) {
+                if (economy.getBalance(plr.getName()) < cost) {
                     sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + cost);
                     return true;
                 }
-                economy.withdrawPlayer(plr, cost);
+                EconHandler.withdrawPlayer(plr, cost);
                 sendMessage(plr, C.REMOVED_BALANCE, cost + "");
             }
         }
@@ -153,97 +149,93 @@ public class Auto extends SubCommand {
                 sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
                 return true;
             }
-            if (!PlotMain.hasPermission(plr, "plots.claim." + schematic) && !plr.hasPermission("plots.admin.command.schematic")) {
+            if (!Permissions.hasPermission(plr, "plots.claim." + schematic) && !plr.hasPermission("plots.admin.command.schematic")) {
-                PlayerFunctions.sendMessage(plr, C.NO_SCHEMATIC_PERMISSION, schematic);
+                MainUtil.sendMessage(plr, C.NO_SCHEMATIC_PERMISSION, schematic);
                 return true;
             }
             // }
         }
-        
+        final String worldname = world;
-        PlotWorld plotworld = PlotMain.getWorldSettings(world);
+        final PlotWorld plotworld = PlotSquared.getPlotWorld(worldname);
         if (plotworld.TYPE == 2) {
-        	Location loc = plr.getLocation();
+            final Location loc = plr.getLocation();
-        	Plot plot = PlotHelper.getCurrentPlot(loc);
+            final Plot plot = MainUtil.getPlot(new Location(worldname, loc.getX(), loc.getY(), loc.getZ()));
             if (plot == null) {
                 return sendMessage(plr, C.NOT_IN_PLOT);
             }
-        	PlotCluster cluster = ClusterManager.getCluster(loc);
+            final PlotCluster cluster = ClusterManager.getCluster(loc);
             // Must be standing in a cluster
             if (cluster == null) {
-                PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                 return false;
             }
-        	PlotId bot = cluster.getP1();
+            final PlotId bot = cluster.getP1();
-        	PlotId top = cluster.getP2();
+            final PlotId top = cluster.getP2();
-        	PlotId origin = new PlotId((bot.x + top.x) / 2, (bot.y + top.y) / 2);
+            final PlotId origin = new PlotId((bot.x + top.x) / 2, (bot.y + top.y) / 2);
             PlotId id = new PlotId(0, 0);
-        	int width = Math.max(top.x - bot.x + 1, top.y - bot.y + 1);
+            final int width = Math.max((top.x - bot.x) + 1, (top.y - bot.y) + 1);
-        	int max = width * width;
+            final int max = width * width;
             //
             for (int i = 0; i <= max; i++) {
-        	    PlotId currentId = new PlotId(origin.x + id.x, origin.y + id.y);
+                final PlotId currentId = new PlotId(origin.x + id.x, origin.y + id.y);
-        	    Plot current = PlotHelper.getPlot(world, currentId);
+                final Plot current = MainUtil.getPlot(worldname, currentId);
-        	    if (current != null && (current.hasOwner() == false) && (current.settings.isMerged() == false) && cluster.equals(ClusterManager.getCluster(current))) {
+                if ((current != null) && (current.hasOwner() == false) && (current.settings.isMerged() == false) && cluster.equals(ClusterManager.getCluster(current))) {
                     Claim.claimPlot(plr, current, true, true);
                     return true;
                 }
                 id = getNextPlot(id, 1);
             }
-        	
             // no free plots
-        	PlayerFunctions.sendMessage(plr, C.NO_FREE_PLOTS);
+            MainUtil.sendMessage(plr, C.NO_FREE_PLOTS);
             return false;
         }
-        
         boolean br = false;
-        String worldname = world.getName();
         if ((size_x == 1) && (size_z == 1)) {
             while (!br) {
-                final Plot plot = PlotHelper.getPlot(world, getLastPlot(worldname));
+                final Plot plot = MainUtil.getPlot(worldname, getLastPlot(worldname));
                 if ((plot.owner == null)) {
                     Claim.claimPlot(plr, plot, true, true);
                     br = true;
                 }
-                PlotHelper.lastPlot.put(worldname, getNextPlot(getLastPlot(worldname), 1));
+                MainUtil.lastPlot.put(worldname, getNextPlot(getLastPlot(worldname), 1));
             }
         } else {
             boolean lastPlot = true;
             while (!br) {
                 final PlotId start = getNextPlot(getLastPlot(worldname), 1);
                 // Checking if the current set of plots is a viable option.
-                PlotHelper.lastPlot.put(worldname, start);
+                MainUtil.lastPlot.put(worldname, start);
                 if (lastPlot) {
                 }
-                if ((PlotMain.getPlots(world).get(start) != null) && (PlotMain.getPlots(world).get(start).owner != null)) {
+                if ((PlotSquared.getPlots(worldname).get(start) != null) && (PlotSquared.getPlots(worldname).get(start).owner != null)) {
                     continue;
                 } else {
                     lastPlot = false;
                 }
                 final PlotId end = new PlotId((start.x + size_x) - 1, (start.y + size_z) - 1);
-                if (PlotHelper.isUnowned(world, start, end)) {
+                if (MainUtil.isUnowned(worldname, start, end)) {
                     for (int i = start.x; i <= end.x; i++) {
                         for (int j = start.y; j <= end.y; j++) {
-                            final Plot plot = PlotHelper.getPlot(world, new PlotId(i, j));
+                            final Plot plot = MainUtil.getPlot(worldname, new PlotId(i, j));
                             final boolean teleport = ((i == end.x) && (j == end.y));
                             Claim.claimPlot(plr, plot, teleport, true);
                         }
                     }
-                    if (!PlotHelper.mergePlots(plr, world, PlayerFunctions.getPlotSelectionIds(start, end))) {
+                    if (!MainUtil.mergePlots(worldname, MainUtil.getPlotSelectionIds(start, end), true)) {
                         return false;
                     }
                     br = true;
                 }
             }
         }
-        PlotHelper.lastPlot.put(worldname, new PlotId(0, 0));
+        MainUtil.lastPlot.put(worldname, new PlotId(0, 0));
         return true;
     }
     
-    public PlotId getLastPlot(String world) {
+    public PlotId getLastPlot(final String world) {
-    	if (PlotHelper.lastPlot == null || !PlotHelper.lastPlot.containsKey(world)) {
+        if ((MainUtil.lastPlot == null) || !MainUtil.lastPlot.containsKey(world)) {
-    		PlotHelper.lastPlot.put(world, new PlotId(0,0));
+            MainUtil.lastPlot.put(world, new PlotId(0, 0));
         }
-    	return PlotHelper.lastPlot.get(world);
+        return MainUtil.lastPlot.get(world);
     }
-    
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Ban.java

@@ -1,34 +0,0 @@
-package com.intellectualcrafters.plot.commands;
-
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-
-/**
- * Created 2014-11-09 for PlotSquared
- *
- * @author Citymonstret
- */
-public class Ban extends SubCommand {
-
-    public Ban() {
-        super(Command.BAN, "Alias for /plot denied add", "/plot ban [player]", CommandCategory.ACTIONS, true);
-    }
-
-    @Override
-    public boolean execute(final Player plr, final String... args) {
-        if (args.length < 1) {
-            return PlayerFunctions.sendMessage(plr, "&cUsage: &c" + this.usage);
-        }
-        if (!PlayerFunctions.isInPlot(plr)) {
-            return sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if (!plot.hasRights(plr)) {
-            return sendMessage(plr, C.NO_PLOT_PERMS);
-        }
-        return plr.performCommand("plot denied add " + args[0]);
-    }
-}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/BukkitCommand.java

@@ -0,0 +1,65 @@
+package com.intellectualcrafters.plot.commands;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
+
+/**
+ * Created 2015-02-20 for PlotSquared
+ *
+ * @author Citymonstret
+ */
+public class BukkitCommand implements CommandExecutor, TabCompleter {
+
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String commandLabel, String[] args) {
+        Player player = null;
+        if (commandSender instanceof Player) {
+            player = (Player) commandSender;
+        }
+        return MainCommand.onCommand(BukkitUtil.getPlayer(player), commandLabel, args);
+    }
+    
+    @Override
+    public List<String> onTabComplete(final CommandSender commandSender, final Command command, final String s, final String[] strings) {
+        if (!(commandSender instanceof Player)) {
+            return null;
+        }
+        final PlotPlayer player = BukkitUtil.getPlayer((Player) commandSender);
+        if (strings.length < 1) {
+            if ((strings.length == 0) || "plots".startsWith(s)) {
+                return Arrays.asList("plots");
+            }
+        }
+        if (strings.length > 1) {
+            return null;
+        }
+        if (!command.getLabel().equalsIgnoreCase("plots")) {
+            return null;
+        }
+        final List<String> tabOptions = new ArrayList<>();
+        final String arg = strings[0].toLowerCase();
+        for (final SubCommand cmd : MainCommand.subCommands) {
+            if (cmd.permission.hasPermission(player)) {
+                if (cmd.cmd.startsWith(arg)) {
+                    tabOptions.add(cmd.cmd);
+                } else if (cmd.alias.get(0).startsWith(arg)) {
+                    tabOptions.add(cmd.alias.get(0));
+                }
+            }
+        }
+        if (tabOptions.size() > 0) {
+            return tabOptions;
+        }
+        return null;
+    }
+}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Buy.java

@@ -18,101 +18,95 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import net.milkbowl.vault.economy.Economy;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.EconHandler;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * @author Citymonstret
  */
 public class Buy extends SubCommand {
-
     public Buy() {
         super(Command.BUY, "Buy the plot you are standing on", "b", CommandCategory.CLAIMING, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlotMain.useEconomy) {
+        if (PlotSquared.economy == null) {
             return sendMessage(plr, C.ECON_DISABLED);
         }
-        World world = plr.getWorld();
+        Location loc = plr.getLocation();
-        if (!PlotMain.isPlotWorld(world)) {
+        final String world = loc.getWorld();
+        if (!PlotSquared.isPlotWorld(world)) {
             return sendMessage(plr, C.NOT_IN_PLOT_WORLD);
         }
         Plot plot;
         if (args.length > 0) {
             try {
-                String[] split = args[0].split(";");
+                final String[] split = args[0].split(";");
-                PlotId id = new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
+                final PlotId id = new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-                plot = PlotHelper.getPlot(world, id);
+                plot = MainUtil.getPlot(world, id);
-            }
+            } catch (final Exception e) {
-            catch (Exception e) {
                 return sendMessage(plr, C.NOT_VALID_PLOT_ID);
             }
-        }
+        } else {
-        else {
+            plot = MainUtil.getPlot(loc);
-            plot = PlayerFunctions.getCurrentPlot(plr);
         }
         if (plot == null) {
             return sendMessage(plr, C.NOT_IN_PLOT);
         }
-        if (PlayerFunctions.getPlayerPlotCount(world, plr) >= PlayerFunctions.getAllowedPlots(plr)) {
+        int currentPlots = MainUtil.getPlayerPlotCount(world, plr);
+        if (currentPlots >= MainUtil.getAllowedPlots(plr, currentPlots)) {
             return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
         }
         if (!plot.hasOwner()) {
             return sendMessage(plr, C.PLOT_UNOWNED);
         }
-        if (plot.owner.equals(UUIDHandler.getUUID(plr))) {
+        if (plot.owner.equals(plr.getUUID())) {
             return sendMessage(plr, C.CANNOT_BUY_OWN);
         }
-        Flag flag = FlagManager.getPlotFlag(plot, "price");
+        final Flag flag = FlagManager.getPlotFlag(plot, "price");
         if (flag == null) {
             return sendMessage(plr, C.NOT_FOR_SALE);
         }
         double initPrice = (double) flag.getValue();
         double price = initPrice;
-        PlotId id = plot.id;
+        final PlotId id = plot.id;
-        PlotId id2 = PlayerFunctions.getTopPlot(world, plot).id;
+        final PlotId id2 = MainUtil.getTopPlot(plot).id;
-        int size = PlayerFunctions.getPlotSelectionIds(id, id2).size();
+        final int size = MainUtil.getPlotSelectionIds(id, id2).size();
-        PlotWorld plotworld = PlotMain.getWorldSettings(world);
+        final PlotWorld plotworld = PlotSquared.getPlotWorld(world);
         if (plotworld.USE_ECONOMY) {
             price += plotworld.PLOT_PRICE * size;
             initPrice += plotworld.SELL_PRICE * size;
         }
-        if (price > 0d) {
+        if (PlotSquared.economy != null && price > 0d) {
-            final Economy economy = PlotMain.economy;
+            if (EconHandler.getBalance(plr) < price) {
-            if (economy.getBalance(plr) < price) {
                 return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + price);
             }
-            economy.withdrawPlayer(plr, price);
+            EconHandler.withdrawPlayer(plr, price);
             sendMessage(plr, C.REMOVED_BALANCE, price + "");
-            economy.depositPlayer(UUIDHandler.uuidWrapper.getOfflinePlayer(plot.owner), initPrice);
+            EconHandler.depositPlayer(UUIDHandler.uuidWrapper.getOfflinePlayer(plot.owner), initPrice);
-            Player owner = UUIDHandler.uuidWrapper.getPlayer(plot.owner);
+            PlotPlayer owner = UUIDHandler.getPlayer(plot.owner);
             if (owner != null) {
                 sendMessage(plr, C.PLOT_SOLD, plot.id + "", plr.getName(), initPrice + "");
             }
             FlagManager.removePlotFlag(plot, "price");
         }
-        plot.owner = UUIDHandler.getUUID(plr);
+        plot.owner = plr.getUUID();
         DBFunc.setOwner(plot, plot.owner);
-        PlayerFunctions.sendMessage(plr, C.CLAIMED);
+        MainUtil.sendMessage(plr, C.CLAIMED);
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java

@@ -18,57 +18,54 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import net.milkbowl.vault.economy.Economy;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.events.PlayerClaimPlotEvent;
+import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.generator.ClassicPlotWorld;
-import com.intellectualcrafters.plot.generator.HybridPlotWorld;
 import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.EconHandler;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.SchematicHandler;
 
 /**
  * @author Citymonstret
  */
 public class Claim extends SubCommand {
-
     public Claim() {
         super(Command.CLAIM, "Claim the current plot you're standing on.", "claim", CommandCategory.CLAIMING, true);
     }
     
-    public static boolean claimPlot(final Player player, final Plot plot, final boolean teleport, final boolean auto) {
+    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final boolean auto) {
         return claimPlot(player, plot, teleport, "", auto);
     }
     
-    public static boolean claimPlot(final Player player, final Plot plot, final boolean teleport, final String schematic, final boolean auto) {
+    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final String schematic, final boolean auto) {
         if (plot.hasOwner() || plot.settings.isMerged()) {
             return false;
         }
-        final PlayerClaimPlotEvent event = new PlayerClaimPlotEvent(player, plot, auto);
+        // FIXME claim plot event
-        Bukkit.getPluginManager().callEvent(event);
+//        final PlayerClaimPlotEvent event = new PlayerClaimPlotEvent(player, plot, auto);
-        if (!event.isCancelled()) {
+//        Bukkit.getPluginManager().callEvent(event);
-            PlotHelper.createPlot(player, plot);
+//        boolean result = event.isCancelled();
-            PlotHelper.setSign(player, plot);
+        boolean result = true;
-            PlayerFunctions.sendMessage(player, C.CLAIMED);
+        
+        if (!result) {
+            MainUtil.createPlot(player.getUUID(), plot);
+            MainUtil.setSign(player.getName(), plot);
+            MainUtil.sendMessage(player, C.CLAIMED);
+            Location loc = player.getLocation();
             if (teleport) {
-                PlotMain.teleportPlayer(player, player.getLocation(), plot);
+                MainUtil.teleportPlayer(player, loc, plot);
             }
-            World world = plot.getWorld();
+            final String world = plot.world;
-            final PlotWorld plotworld = PlotMain.getWorldSettings(world);
+            final PlotWorld plotworld = PlotSquared.getPlotWorld(world);
-
+            final Plot plot2 = PlotSquared.getPlots(world).get(plot.id);
-            final Plot plot2 = PlotMain.getPlots(player.getWorld()).get(plot.id);
-
             if (plotworld.SCHEMATIC_ON_CLAIM) {
                 SchematicHandler.Schematic sch;
                 if (schematic.equals("")) {
@@ -81,37 +78,39 @@ public class Claim extends SubCommand {
                 }
                 SchematicHandler.paste(player.getLocation(), sch, plot2, 0, 0);
             }
-            PlotMain.getPlotManager(plot.world).claimPlot(world, plotworld, plot);
+            PlotSquared.getPlotManager(world).claimPlot(plotworld, plot);
-            PlotHelper.update(player.getLocation());
+            MainUtil.update(loc);
         }
-        return event.isCancelled();
+        return !result;
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         String schematic = "";
         if (args.length >= 1) {
             schematic = args[0];
         }
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
+        Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) {
             return sendMessage(plr, C.NOT_IN_PLOT);
         }
-        if (PlayerFunctions.getPlayerPlotCount(plr.getWorld(), plr) >= PlayerFunctions.getAllowedPlots(plr)) {
+        int currentPlots = MainUtil.getPlayerPlotCount(loc.getWorld(), plr);
+        if (currentPlots >= MainUtil.getAllowedPlots(plr, currentPlots)) {
             return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
         if (plot.hasOwner()) {
             return sendMessage(plr, C.PLOT_IS_CLAIMED);
         }
-        final PlotWorld world = PlotMain.getWorldSettings(plot.getWorld());
+        final PlotWorld world = PlotSquared.getPlotWorld(plot.world);
-        if (PlotMain.useEconomy && world.USE_ECONOMY) {
+        if (PlotSquared.economy != null && world.USE_ECONOMY) {
             final double cost = world.PLOT_PRICE;
             if (cost > 0d) {
-                final Economy economy = PlotMain.economy;
+                final Economy economy = PlotSquared.economy;
-                if (economy.getBalance(plr) < cost) {
+                if (EconHandler.getBalance(plr) < cost) {
                     return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + cost);
                 }
-                economy.withdrawPlayer(plr, cost);
+                EconHandler.withdrawPlayer(plr, cost);
                 sendMessage(plr, C.REMOVED_BALANCE, cost + "");
             }
         }
@@ -120,12 +119,11 @@ public class Claim extends SubCommand {
                 if (!world.SCHEMATICS.contains(schematic.toLowerCase())) {
                     return sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
                 }
-                if (!PlotMain.hasPermission(plr, "plots.claim." + schematic) && !plr.hasPermission("plots.admin.command.schematic")) {
+                if (!Permissions.hasPermission(plr, "plots.claim." + schematic) && !plr.hasPermission("plots.admin.command.schematic")) {
                     return sendMessage(plr, C.NO_SCHEMATIC_PERMISSION, schematic);
                 }
             }
         }
-
         return !claimPlot(plr, plot, false, schematic, false) || sendMessage(plr, C.PLOT_NOT_CLAIMED);
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java

@@ -18,71 +18,74 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class Clear extends SubCommand {
-
     public Clear() {
         super(Command.CLEAR, "Clear a plot", "clear", CommandCategory.ACTIONS, false);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr == null) {
             // Is console
             if (args.length < 2) {
-                PlotMain.sendConsoleSenderMessage("You need to specify two arguments: ID (0;0) & World (world)");
+                PlotSquared.log("You need to specify two arguments: ID (0;0) & World (world)");
             } else {
                 final PlotId id = PlotId.fromString(args[0]);
                 final String world = args[1];
                 if (id == null) {
-                    PlotMain.sendConsoleSenderMessage("Invalid Plot ID: " + args[0]);
+                    PlotSquared.log("Invalid Plot ID: " + args[0]);
                 } else {
-                    if (!PlotMain.isPlotWorld(world)) {
+                    if (!PlotSquared.isPlotWorld(world)) {
-                        PlotMain.sendConsoleSenderMessage("Invalid plot world: " + world);
+                        PlotSquared.log("Invalid plot world: " + world);
                     } else {
-                        final Plot plot = PlotHelper.getPlot(Bukkit.getWorld(world), id);
+                        final Plot plot = MainUtil.getPlot(world, id);
                         if (plot == null) {
-                            PlotMain.sendConsoleSenderMessage("Could not find plot " + args[0] + " in world " + world);
+                            PlotSquared.log("Could not find plot " + args[0] + " in world " + world);
                         } else {
-                            plot.clear(null, false);
+                            MainUtil.clear(world, plot, true, null);
-                            PlotMain.sendConsoleSenderMessage("Plot " + plot.getId().toString() + " cleared.");
+                            PlotSquared.log("Plot " + plot.getId().toString() + " cleared.");
                         }
                     }
                 }
             }
             return true;
         }
-
+        Location loc = plr.getLocation();
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) {
             return sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
+        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot( plot))) {
-        if (!PlayerFunctions.getTopPlot(plr.getWorld(), plot).equals(PlayerFunctions.getBottomPlot(plr.getWorld(), plot))) {
             return sendMessage(plr, C.UNLINK_REQUIRED);
         }
-        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !PlotMain.hasPermission(plr, "plots.admin.command.clear")) {
+        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.clear")) {
             return sendMessage(plr, C.NO_PLOT_PERMS);
         }
         assert plot != null;
-        plot.clear(plr, false);
+        final long start = System.currentTimeMillis();
-
+        boolean result = MainUtil.clearAsPlayer(plot, false, new Runnable() {
+            @Override
+            public void run() {
+                MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));
+            }
+        });
+        if (!result) {
+            MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
+        }
         // sign
-
         // wall
-
+        return result;
-        return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clipboard.java

@@ -1,58 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-package com.intellectualcrafters.plot.commands;
-
-import static com.intellectualcrafters.plot.object.PlotSelection.currentSelection;
-
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotSelection;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-
-public class Clipboard extends SubCommand {
-
-    public Clipboard() {
-        super(Command.CLIPBOARD, "View information about your current copy", "clipboard", CommandCategory.INFO, true);
-    }
-
-    @Override
-    public boolean execute(final Player plr, final String... args) {
-        if (!currentSelection.containsKey(plr.getName())) {
-            return sendMessage(plr, C.NO_CLIPBOARD);
-        }
-        final PlotSelection selection = currentSelection.get(plr.getName());
-
-        final PlotId plotId = selection.getPlot().getId();
-        final int width = selection.getWidth();
-        final int total = selection.getBlocks().length;
-
-        String message = C.CLIPBOARD_INFO.s();
-
-        message = message.replace("%id", plotId.toString()).replace("%width", width + "").replace("%total", total + "");
-
-        PlayerFunctions.sendMessage(plr, message);
-
-        return true;
-    }
-}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java

@@ -18,117 +18,108 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.UUID;
 
-import org.bukkit.Location;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.entity.Player;
-import org.bukkit.generator.BlockPopulator;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.generator.AugmentedPopulator;
 import com.intellectualcrafters.plot.object.BlockLoc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotCluster;
 import com.intellectualcrafters.plot.object.PlotClusterId;
 import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.ClusterManager;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class Cluster extends SubCommand {
-
     public Cluster() {
         super(Command.CLUSTER, "Manage a plot cluster", "cluster", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
-        
         if (args.length == 0) {
             // return arguments
-            PlayerFunctions.sendMessage(plr, C.CLUSTER_AVAILABLE_ARGS);
+            MainUtil.sendMessage(plr, C.CLUSTER_AVAILABLE_ARGS);
             return false;
         }
-        String sub = args[0].toLowerCase();
+        final String sub = args[0].toLowerCase();
         switch (sub) {
             case "l":
             case "list": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.list")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.list")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.list");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.list");
                     return false;
                 }
                 if (args.length != 1) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster list");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster list");
                     return false;
                 }
-                HashSet<PlotCluster> clusters = ClusterManager.getClusters(plr.getWorld());
+                final HashSet<PlotCluster> clusters = ClusterManager.getClusters(plr.getLocation().getWorld());
-                PlayerFunctions.sendMessage(plr, C.CLUSTER_LIST_HEADING, clusters.size() + "");
+                MainUtil.sendMessage(plr, C.CLUSTER_LIST_HEADING, clusters.size() + "");
-                for (PlotCluster cluster : clusters) {
+                for (final PlotCluster cluster : clusters) {
                     // Ignore unmanaged clusters
-                    String name = "'" + cluster.getName() + "' : " + cluster.toString();
+                    final String name = "'" + cluster.getName() + "' : " + cluster.toString();
                     if (UUIDHandler.getUUID(plr).equals(cluster.owner)) {
-                        PlayerFunctions.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&a" + name);
+                        MainUtil.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&a" + name);
-                    }
+                    } else if (cluster.helpers.contains(UUIDHandler.getUUID(plr))) {
-                    else if (cluster.helpers.contains(UUIDHandler.getUUID(plr))) {
+                        MainUtil.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&3" + name);
-                        PlayerFunctions.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&3" + name);
+                    } else if (cluster.invited.contains(UUIDHandler.getUUID(plr))) {
-                    }
+                        MainUtil.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&9" + name);
-                    else if (cluster.invited.contains(UUIDHandler.getUUID(plr))) {
+                    } else {
-                        PlayerFunctions.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&9" + name);
+                        MainUtil.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, cluster.toString());
-                    }
-                    else {
-                        PlayerFunctions.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, cluster.toString());
                     }
                 }
                 return true;
             }
             case "c":
             case "create": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.create")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.create")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.create");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.create");
                     return false;
                 }
                 if (args.length != 4) {
-                    PlotId id = ClusterManager.estimatePlotId(plr.getLocation());
+                    final PlotId id = ClusterManager.estimatePlotId(plr.getLocation());
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster create <name> <id-bot> <id-top>");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster create <name> <id-bot> <id-top>");
-                    PlayerFunctions.sendMessage(plr, C.CLUSTER_CURRENT_PLOTID, "" + id);
+                    MainUtil.sendMessage(plr, C.CLUSTER_CURRENT_PLOTID, "" + id);
                     return false;
                 }
                 // check pos1 / pos2
-                PlotId pos1 = PlotHelper.parseId(args[2]);
+                final PlotId pos1 = MainUtil.parseId(args[2]);
-                PlotId pos2 = PlotHelper.parseId(args[3]);
+                final PlotId pos2 = MainUtil.parseId(args[3]);
-                if (pos1 == null || pos2 == null) {
+                if ((pos1 == null) || (pos2 == null)) {
-                    PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
+                    MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
                     return false;
                 }
                 // check if name is taken
-                String name = args[1];
+                final String name = args[1];
-                for (PlotCluster cluster : ClusterManager.getClusters(plr.getWorld())) {
+                for (final PlotCluster cluster : ClusterManager.getClusters(plr.getLocation().getWorld())) {
                     if (name.equals(cluster.getName())) {
-                        PlayerFunctions.sendMessage(plr, C.ALIAS_IS_TAKEN);
+                        MainUtil.sendMessage(plr, C.ALIAS_IS_TAKEN);
                         return false;
                     }
                 }
                 //check if overlap
-                PlotClusterId id = new PlotClusterId(pos1, pos2);
+                final PlotClusterId id = new PlotClusterId(pos1, pos2);
-                HashSet<PlotCluster> intersects = ClusterManager.getIntersects(plr.getWorld().getName(), id);
+                final HashSet<PlotCluster> intersects = ClusterManager.getIntersects(plr.getLocation().getWorld(), id);
-                if (intersects.size() > 0 || pos2.x < pos1.x || pos2.y < pos1.y) {
+                if ((intersects.size() > 0) || (pos2.x < pos1.x) || (pos2.y < pos1.y)) {
-                    PlayerFunctions.sendMessage(plr, C.CLUSTER_INTERSECTION, intersects.size() + "");
+                    MainUtil.sendMessage(plr, C.CLUSTER_INTERSECTION, intersects.size() + "");
                     return false;
                 }
                 // create cluster
-                String world = plr.getWorld().getName();
+                final String world = plr.getLocation().getWorld();
-                PlotCluster cluster = new PlotCluster(world, pos1, pos2, UUIDHandler.getUUID(plr));
+                final PlotCluster cluster = new PlotCluster(world, pos1, pos2, UUIDHandler.getUUID(plr));
                 cluster.settings.setAlias(name);
                 DBFunc.createCluster(world, cluster);
                 if (!ClusterManager.clusters.containsKey(world)) {
@@ -136,234 +127,225 @@ public class Cluster extends SubCommand {
                 }
                 ClusterManager.clusters.get(world).add(cluster);
                 // Add any existing plots to the current cluster
-                for (Plot plot : PlotMain.getPlots(plr.getWorld()).values()) {
+                for (final Plot plot : PlotSquared.getPlots(plr.getLocation().getWorld()).values()) {
-                    PlotCluster current = ClusterManager.getCluster(plot);
+                    final PlotCluster current = ClusterManager.getCluster(plot);
                     if (cluster.equals(current) && !cluster.hasRights(plot.owner)) {
                         cluster.invited.add(plot.owner);
                         DBFunc.setInvited(world, cluster, plot.owner);
                     }
                 }
-                if (!PlotMain.isPlotWorld(world)) {
+                if (!PlotSquared.isPlotWorld(world)) {
-                    PlotMain.config.createSection("worlds." + world);
+                    PlotSquared.config.createSection("worlds." + world);
-                    PlotMain.loadWorld(plr.getWorld());
+                    PlotSquared.loadWorld(world, null);
                 }
-                PlayerFunctions.sendMessage(plr, C.CLUSTER_ADDED);
+                MainUtil.sendMessage(plr, C.CLUSTER_ADDED);
                 return true;
             }
             case "disband":
             case "del":
             case "delete": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.delete")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.delete")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.delete");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.delete");
                     return false;
                 }
-                if (args.length != 1 && args.length != 2) {
+                if ((args.length != 1) && (args.length != 2)) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster delete [name]");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster delete [name]");
                     return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
-                    cluster = ClusterManager.getCluster(plr.getWorld().getName(), args[1]);
+                    cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
                     if (cluster == null) {
-                        PlayerFunctions.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
+                        MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                         return false;
                     }
-                }
+                } else {
-                else {
                     cluster = ClusterManager.getCluster(plr.getLocation());
                     if (cluster == null) {
-                        PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                        MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
                 if (!cluster.owner.equals(UUIDHandler.getUUID(plr))) {
-                    if (!PlotMain.hasPermission(plr, "plots.cluster.delete.other")) {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.delete.other")) {
-                        PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.delete.other");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.delete.other");
                         return false;
                     }
                 }
-                PlotWorld plotworld = PlotMain.getWorldSettings(plr.getWorld());
+                final PlotWorld plotworld = PlotSquared.getPlotWorld(plr.getLocation().getWorld());
                 if (plotworld.TYPE == 2) {
-                    ArrayList<Plot> toRemove = new ArrayList<>();
+                    final ArrayList<Plot> toRemove = new ArrayList<>();
-                    for (Plot plot : PlotMain.getPlots(plr.getWorld()).values()) {
+                    for (final Plot plot : PlotSquared.getPlots(plr.getLocation().getWorld()).values()) {
-                        PlotCluster other = ClusterManager.getCluster(plot);
+                        final PlotCluster other = ClusterManager.getCluster(plot);
                         if (cluster.equals(other)) {
                             toRemove.add(plot);
                         }
                     }
-                    for (Plot plot : toRemove) {
+                    for (final Plot plot : toRemove) {
                         DBFunc.delete(plot.world, plot);
                     }
                 }
                 DBFunc.delete(cluster);
                 if (plotworld.TYPE == 2) {
-                    for (Iterator<BlockPopulator> iterator = plr.getWorld().getPopulators().iterator(); iterator.hasNext();) {
+                    AugmentedPopulator.removePopulator(plr.getLocation().getWorld(), cluster);
-                        BlockPopulator populator = iterator.next();
-                        if (populator instanceof AugmentedPopulator) {
-                            if (((AugmentedPopulator) populator).cluster.equals(cluster)) {
-                                iterator.remove();
                 }
-                        }
+                for (final String set : ClusterManager.clusters.keySet()) {
-                    }
-                }
-                for (String set : ClusterManager.clusters.keySet()) {
                 }
                 ClusterManager.last = null;
                 ClusterManager.clusters.get(cluster.world).remove(cluster);
                 ClusterManager.regenCluster(cluster);
-                PlayerFunctions.sendMessage(plr, C.CLUSTER_DELETED);
+                MainUtil.sendMessage(plr, C.CLUSTER_DELETED);
                 return true;
             }
             case "res":
             case "resize": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.resize")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.resize")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize");
                     return false;
                 }
                 if (args.length != 3) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster resize <pos1> <pos2>");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster resize <pos1> <pos2>");
                     return false;
                 }
                 // check pos1 / pos2
-                PlotId pos1 = PlotHelper.parseId(args[1]);
+                final PlotId pos1 = MainUtil.parseId(args[1]);
-                PlotId pos2 = PlotHelper.parseId(args[2]);
+                final PlotId pos2 = MainUtil.parseId(args[2]);
-                if (pos1 == null || pos2 == null) {
+                if ((pos1 == null) || (pos2 == null)) {
-                    PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
+                    MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
                     return false;
                 }
                 // check if in cluster
-                PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
+                final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
                 if (cluster == null) {
-                    PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
                 if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr))) {
-                    if (!PlotMain.hasPermission(plr, "plots.cluster.resize.other")) {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.resize.other")) {
-                        PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize.other");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize.other");
                         return false;
                     }
                 }
                 //check if overlap
-                PlotClusterId id = new PlotClusterId(pos1, pos2);
+                final PlotClusterId id = new PlotClusterId(pos1, pos2);
-                HashSet<PlotCluster> intersects = ClusterManager.getIntersects(plr.getWorld().getName(), id);
+                final HashSet<PlotCluster> intersects = ClusterManager.getIntersects(plr.getLocation().getWorld(), id);
                 if (intersects.size() > 1) {
-                    PlayerFunctions.sendMessage(plr, C.CLUSTER_INTERSECTION, (intersects.size() - 1) + "");
+                    MainUtil.sendMessage(plr, C.CLUSTER_INTERSECTION, (intersects.size() - 1) + "");
                     return false;
                 }
                 // resize cluster
                 DBFunc.resizeCluster(cluster, id);
-                PlayerFunctions.sendMessage(plr, C.CLUSTER_RESIZED);
+                MainUtil.sendMessage(plr, C.CLUSTER_RESIZED);
                 return true;
             }
             case "reg":
             case "regenerate":
             case "regen": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.delete")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.delete")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.regen");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.regen");
                     return false;
                 }
-                if (args.length != 1 && args.length != 2) {
+                if ((args.length != 1) && (args.length != 2)) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster regen [name]");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster regen [name]");
                     return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
-                    cluster = ClusterManager.getCluster(plr.getWorld().getName(), args[1]);
+                    cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
                     if (cluster == null) {
-                        PlayerFunctions.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
+                        MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                         return false;
                     }
-                }
+                } else {
-                else {
                     cluster = ClusterManager.getCluster(plr.getLocation());
                     if (cluster == null) {
-                        PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                        MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
                 if (!cluster.owner.equals(UUIDHandler.getUUID(plr))) {
-                    if (!PlotMain.hasPermission(plr, "plots.cluster.regen.other")) {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.regen.other")) {
-                        PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.regen.other");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.regen.other");
                         return false;
                     }
                 }
                 ClusterManager.regenCluster(cluster);
-                PlayerFunctions.sendMessage(plr, C.CLUSTER_REGENERATED);
+                MainUtil.sendMessage(plr, C.CLUSTER_REGENERATED);
                 return true;
             }
             case "add":
             case "inv":
             case "invite": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.invite")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.invite")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.invite");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.invite");
                     return false;
                 }
                 if (args.length != 2) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster invite <player>");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster invite <player>");
                     return false;
                 }
                 // check if in cluster
-                PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
+                final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
                 if (cluster == null) {
-                    PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
                 if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr))) {
-                    if (!PlotMain.hasPermission(plr, "plots.cluster.invite.other")) {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.invite.other")) {
-                        PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.invite.other");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.invite.other");
                         return false;
                     }
                 }
                 // check uuid
-                UUID uuid = UUIDHandler.getUUID(args[1]);
+                final UUID uuid = UUIDHandler.getUUID(args[1]);
                 if (uuid == null) {
-                    PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER, args[1]);
+                    MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]);
                     return false;
                 }
                 if (!cluster.hasRights(uuid)) {
                     // add the user if not added
                     cluster.invited.add(uuid);
-                    String world = plr.getWorld().getName();
+                    final String world = plr.getLocation().getWorld();
                     DBFunc.setInvited(world, cluster, uuid);
-                    Player player = UUIDHandler.uuidWrapper.getPlayer(uuid);
+                    PlotPlayer player = UUIDHandler.getPlayer(uuid);
                     if (player != null) {
-                        PlayerFunctions.sendMessage(player, C.CLUSTER_INVITED, cluster.getName());
+                        MainUtil.sendMessage(player, C.CLUSTER_INVITED, cluster.getName());
                     }
                 }
-                PlayerFunctions.sendMessage(plr, C.CLUSTER_ADDED_USER);
+                MainUtil.sendMessage(plr, C.CLUSTER_ADDED_USER);
                 return true;
             }
             case "k":
             case "remove":
             case "kick": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.kick")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.kick")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.kick");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.kick");
                     return false;
                 }
                 if (args.length != 2) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster kick <player>");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster kick <player>");
                     return false;
                 }
-                PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
+                final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
                 if (cluster == null) {
-                    PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
                 if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr))) {
-                    if (!PlotMain.hasPermission(plr, "plots.cluster.kick.other")) {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.kick.other")) {
-                        PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.kick.other");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.kick.other");
                         return false;
                     }
                 }
                 // check uuid
-                UUID uuid = UUIDHandler.getUUID(args[1]);
+                final UUID uuid = UUIDHandler.getUUID(args[1]);
                 if (uuid == null) {
-                    PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER, args[1]);
+                    MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]);
                     return false;
                 }
                 // Can't kick if the player is yourself, the owner, or not added to the cluster
                 if (uuid.equals(UUIDHandler.getUUID(plr)) || uuid.equals(cluster.owner) || !cluster.hasRights(uuid)) {
-                    PlayerFunctions.sendMessage(plr, C.CANNOT_KICK_PLAYER, cluster.getName());
+                    MainUtil.sendMessage(plr, C.CANNOT_KICK_PLAYER, cluster.getName());
                     return false;
                 }
                 if (cluster.helpers.contains(uuid)) {
@@ -372,52 +354,51 @@ public class Cluster extends SubCommand {
                 }
                 cluster.invited.remove(uuid);
                 DBFunc.removeInvited(cluster, uuid);
-                Player player = UUIDHandler.uuidWrapper.getPlayer(uuid);
+                PlotPlayer player = UUIDHandler.getPlayer(uuid);
                 if (player != null) {
-                    PlayerFunctions.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName());
+                    MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName());
                 }
-                for (Plot plot : PlotMain.getPlots(plr.getWorld(), uuid)) {
+                for (final Plot plot : PlotSquared.getPlots(plr.getLocation().getWorld(), uuid)) {
-                    PlotCluster current = ClusterManager.getCluster(plot);
+                    final PlotCluster current = ClusterManager.getCluster(plot);
-                    if (current != null && current.equals(cluster)) {
+                    if ((current != null) && current.equals(cluster)) {
-                        String world = plr.getWorld().getName();
+                        final String world = plr.getLocation().getWorld();
                         DBFunc.delete(world, plot);
                     }
                 }
-                PlayerFunctions.sendMessage(plr, C.CLUSTER_KICKED_USER);
+                MainUtil.sendMessage(plr, C.CLUSTER_KICKED_USER);
                 return true;
             }
             case "quit":
             case "leave": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.leave")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.leave")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.leave");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.leave");
                     return false;
                 }
-                if (args.length != 1 && args.length != 2) {
+                if ((args.length != 1) && (args.length != 2)) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster leave [name]");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster leave [name]");
                     return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
-                    cluster = ClusterManager.getCluster(plr.getWorld().getName(), args[1]);
+                    cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
                     if (cluster == null) {
-                        PlayerFunctions.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
+                        MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                         return false;
                     }
-                }
+                } else {
-                else {
                     cluster = ClusterManager.getCluster(plr.getLocation());
                     if (cluster == null) {
-                        PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                        MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
-                UUID uuid = UUIDHandler.getUUID(plr);
+                final UUID uuid = UUIDHandler.getUUID(plr);
                 if (!cluster.hasRights(uuid)) {
-                    PlayerFunctions.sendMessage(plr, C.CLUSTER_NOT_ADDED);
+                    MainUtil.sendMessage(plr, C.CLUSTER_NOT_ADDED);
                     return false;
                 }
                 if (uuid.equals(cluster.owner)) {
-                    PlayerFunctions.sendMessage(plr, C.CLUSTER_CANNOT_LEAVE);
+                    MainUtil.sendMessage(plr, C.CLUSTER_CANNOT_LEAVE);
                     return false;
                 }
                 if (cluster.helpers.contains(uuid)) {
@@ -426,11 +407,11 @@ public class Cluster extends SubCommand {
                 }
                 cluster.invited.remove(uuid);
                 DBFunc.removeInvited(cluster, uuid);
-                PlayerFunctions.sendMessage(plr, C.CLUSTER_REMOVED, cluster.getName());
+                MainUtil.sendMessage(plr, C.CLUSTER_REMOVED, cluster.getName());
-                for (Plot plot : PlotMain.getPlots(plr.getWorld(), uuid)) {
+                for (final Plot plot : PlotSquared.getPlots(plr.getLocation().getWorld(), uuid)) {
-                    PlotCluster current = ClusterManager.getCluster(plot);
+                    final PlotCluster current = ClusterManager.getCluster(plot);
-                    if (current != null && current.equals(cluster)) {
+                    if ((current != null) && current.equals(cluster)) {
-                        String world = plr.getWorld().getName();
+                        final String world = plr.getLocation().getWorld();
                         DBFunc.delete(world, plot);
                     }
                 }
@@ -439,139 +420,135 @@ public class Cluster extends SubCommand {
             case "admin":
             case "helper":
             case "helpers": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.helpers")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.helpers")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.helpers");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.helpers");
                     return false;
                 }
                 if (args.length != 3) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster helpers <add|remove> <player>");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster helpers <add|remove> <player>");
                     return false;
                 }
-                PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
+                final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
                 if (cluster == null) {
-                    PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
-                UUID uuid = UUIDHandler.getUUID(args[2]);
+                final UUID uuid = UUIDHandler.getUUID(args[2]);
                 if (uuid == null) {
-                    PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER, args[1]);
+                    MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]);
                     return false;
                 }
                 if (args[1].toLowerCase().equals("add")) {
                     cluster.helpers.add(uuid);
-                    return PlayerFunctions.sendMessage(plr, C.CLUSTER_ADDED_HELPER);
+                    return MainUtil.sendMessage(plr, C.CLUSTER_ADDED_HELPER);
                 }
                 if (args[1].toLowerCase().equals("remove")) {
                     cluster.helpers.remove(uuid);
-                    return PlayerFunctions.sendMessage(plr, C.CLUSTER_REMOVED_HELPER);
+                    return MainUtil.sendMessage(plr, C.CLUSTER_REMOVED_HELPER);
                 }
-                PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster helpers <add|remove> <player>");
+                MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster helpers <add|remove> <player>");
                 return false;
             }
             case "spawn":
             case "home":
             case "tp": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.tp")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.tp")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.tp");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.tp");
                     return false;
                 }
                 if (args.length != 2) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster tp <name>");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster tp <name>");
                     return false;
                 }
-                PlotCluster cluster = ClusterManager.getCluster(plr.getWorld().getName(), args[1]);
+                final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
                 if (cluster == null) {
-                    PlayerFunctions.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
+                    MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                     return false;
                 }
-                UUID uuid = UUIDHandler.getUUID(plr);
+                final UUID uuid = UUIDHandler.getUUID(plr);
                 if (!cluster.hasRights(uuid)) {
-                    if (!PlotMain.hasPermission(plr, "plots.cluster.tp.other")) {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.tp.other")) {
-                        PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.tp.other");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.tp.other");
                         return false;
                     }
                 }
                 plr.teleport(ClusterManager.getHome(cluster));
-                return PlayerFunctions.sendMessage(plr, C.CLUSTER_TELEPORTING);
+                return MainUtil.sendMessage(plr, C.CLUSTER_TELEPORTING);
             }
             case "i":
             case "info":
             case "show":
             case "information": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.info")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.info")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.info");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.info");
                     return false;
                 }
-                if (args.length != 1 && args.length != 2) {
+                if ((args.length != 1) && (args.length != 2)) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster info [name]");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster info [name]");
                     return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
-                    cluster = ClusterManager.getCluster(plr.getWorld().getName(), args[1]);
+                    cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
                     if (cluster == null) {
-                        PlayerFunctions.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
+                        MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                         return false;
                     }
-                }
+                } else {
-                else {
                     cluster = ClusterManager.getCluster(plr.getLocation());
                     if (cluster == null) {
-                        PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                        MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
-                String id = cluster.toString();
+                final String id = cluster.toString();
                 String owner = UUIDHandler.getName(cluster.owner);
                 if (owner == null) {
                     owner = "unknown";
                 }
-                String name = cluster.getName();
+                final String name = cluster.getName();
-                String size = (cluster.getP2().x - cluster.getP1().x + 1) + "x" + (cluster.getP2().y - cluster.getP1().y + 1);
+                final String size = ((cluster.getP2().x - cluster.getP1().x) + 1) + "x" + ((cluster.getP2().y - cluster.getP1().y) + 1);
-                String rights = cluster.hasRights(UUIDHandler.getUUID(plr)) + "";
+                final String rights = cluster.hasRights(UUIDHandler.getUUID(plr)) + "";
-                
                 String message = C.CLUSTER_INFO.s();
                 message = message.replaceAll("%id%", id);
                 message = message.replaceAll("%owner%", owner);
                 message = message.replaceAll("%name%", name);
                 message = message.replaceAll("%size%", size);
                 message = message.replaceAll("%rights%", rights);
-                
+                MainUtil.sendMessage(plr, message);
-                PlayerFunctions.sendMessage(plr, message);
                 return true;
             }
             case "sh":
             case "setspawn":
             case "sethome": {
-                if (!PlotMain.hasPermission(plr, "plots.cluster.sethome")) {
+                if (!Permissions.hasPermission(plr, "plots.cluster.sethome")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.sethome");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.sethome");
                     return false;
                 }
-                if (args.length != 1 && args.length != 2) {
+                if ((args.length != 1) && (args.length != 2)) {
-                    PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster sethome");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster sethome");
                     return false;
                 }
-                PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
+                final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
                 if (cluster == null) {
-                    PlayerFunctions.sendMessage(plr, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
                 if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr))) {
-                    if (!PlotMain.hasPermission(plr, "plots.cluster.sethome.other")) {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.sethome.other")) {
-                        PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.sethome.other");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.sethome.other");
                         return false;
                     }
                 }
-                Location base = ClusterManager.getClusterBottom(cluster);
+                final Location base = ClusterManager.getClusterBottom(cluster);
-                base.setY(0);
+                final Location relative = plr.getLocation().subtract(base.getX(), 0, base.getZ());
-                Location relative = plr.getLocation().subtract(base);
+                final BlockLoc blockloc = new BlockLoc(relative.getX(), relative.getY(), relative.getZ());
-                BlockLoc blockloc = new BlockLoc(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ());
                 cluster.settings.setPosition(blockloc);
-                DBFunc.setPosition(cluster, relative.getBlockX() + "," + relative.getBlockY() + "," + relative.getBlockZ());
+                DBFunc.setPosition(cluster, relative.getX() + "," + relative.getY() + "," + relative.getZ());
-                return PlayerFunctions.sendMessage(plr, C.POSITION_SET);
+                return MainUtil.sendMessage(plr, C.POSITION_SET);
             }
         }
-        PlayerFunctions.sendMessage(plr, C.CLUSTER_AVAILABLE_ARGS);
+        MainUtil.sendMessage(plr, C.CLUSTER_AVAILABLE_ARGS);
         return false;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 /**
@@ -28,7 +27,6 @@ package com.intellectualcrafters.plot.commands;
  * @author Empire92
  */
 public enum Command {
-
     // TODO new commands
     // (economy)
     // - /plot buy
@@ -39,7 +37,7 @@ public enum Command {
     FLAG("flag", "f"),
     TARGET("target"),
     CLUSTER("cluster", "clusters"),
-    BUY("buy","b"),
+    BUY("buy", "b"),
     CREATEROADSCHEMATIC("createroadschematic"),
     DEBUGROADREGEN("debugroadregen"),
     DEBUGFIXFLAGS("debugfixflags"),
@@ -77,17 +75,14 @@ public enum Command {
     UNBAN("unban", "unblock"),
     DATABASE("database", "convert"),
     TP("tp", "tp");
-
     /**
      * Command
      */
     private final String command;
-
     /**
      * Alias
      */
     private final String alias;
-
     /**
      * Permission Node
      */

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java

@@ -18,12 +18,10 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-
+import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.PlotMain;
 
 /**
  * Created by Citymonstret on 2014-08-03.
@@ -31,7 +29,6 @@ import com.intellectualcrafters.plot.PlotMain;
  * @author Citymonstret
  */
 public class CommandPermission {
-
     /**
      * Permission Node
      */
@@ -49,7 +46,7 @@ public class CommandPermission {
      *
      * @return true of player has the required permission node
      */
-    public boolean hasPermission(final Player player) {
+    public boolean hasPermission(final PlotPlayer player) {
-        return PlotMain.hasPermission(player, this.permission);
+        return Permissions.hasPermission(player, this.permission);
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Comment.java

@@ -18,47 +18,44 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotComment;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
 
 public class Comment extends SubCommand {
-
     public Comment() {
         super(Command.COMMENT, "Comment on a plot", "comment", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
+        Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) {
             return sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
         if (!plot.hasOwner()) {
             return sendMessage(plr, C.NOT_IN_PLOT);
         }
-
         final List<String> recipients = Arrays.asList("admin", "owner", "helper", "trusted", "everyone");
-
         if ((args.length > 1) && recipients.contains(args[0].toLowerCase())) {
-
+            if (Permissions.hasPermission(plr, "plots.comment." + args[0].toLowerCase())) {
-            if (PlotMain.hasPermission(plr, "plots.comment." + args[0].toLowerCase())) {
                 final String text = StringUtils.join(Arrays.copyOfRange(args, 1, args.length), " ");
                 final PlotComment comment = new PlotComment(text, plr.getName(), recipients.indexOf(args[0].toLowerCase()));
                 plot.settings.addComment(comment);
-                DBFunc.setComment(plr.getWorld().getName(), plot, comment);
+                DBFunc.setComment(loc.getWorld(), plot, comment);
                 return sendMessage(plr, C.COMMENT_ADDED);
             } else {
                 return sendMessage(plr, C.NO_PERMISSION, "plots.comment." + args[0].toLowerCase());

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
@@ -28,79 +27,74 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 public class Condense extends SubCommand {
-
     public static boolean TASK = false;
-    private static int TASK_ID = 0;
     
     public Condense() {
         super("condense", "plots.admin", "Condense a plotworld", "condense", "", CommandCategory.DEBUG, false);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr != null) {
-            PlayerFunctions.sendMessage(plr, (C.NOT_CONSOLE));
+            MainUtil.sendMessage(plr, (C.NOT_CONSOLE));
             return false;
         }
-        if (args.length != 2 && args.length != 3) {
+        if ((args.length != 2) && (args.length != 3)) {
-            PlayerFunctions.sendMessage(plr, "/plot condense <world> <start|stop|info> [radius]");
+            MainUtil.sendMessage(plr, "/plot condense <world> <start|stop|info> [radius]");
             return false;
         }
-        String worldname = args[0];
+        final String worldname = args[0];
-        final World world = Bukkit.getWorld(worldname);
+        if (!BlockManager.manager.isWorld(worldname) || !PlotSquared.isPlotWorld(worldname)) {
-        if (world == null || !PlotMain.isPlotWorld(worldname)) {
+            MainUtil.sendMessage(plr, "INVALID WORLD");
-            PlayerFunctions.sendMessage(plr, "INVALID WORLD");
             return false;
         }
         switch (args[1].toLowerCase()) {
             case "start": {
                 if (args.length == 2) {
-                    PlayerFunctions.sendMessage(plr, "/plot condense " + worldname + " start <radius>");
+                    MainUtil.sendMessage(plr, "/plot condense " + worldname + " start <radius>");
                     return false;
                 }
                 if (TASK) {
-                    PlayerFunctions.sendMessage(plr, "TASK ALREADY STARTED");
+                    MainUtil.sendMessage(plr, "TASK ALREADY STARTED");
                     return false;
                 }
                 if (args.length == 2) {
-                    PlayerFunctions.sendMessage(plr, "/plot condense " + worldname + " start <radius>");
+                    MainUtil.sendMessage(plr, "/plot condense " + worldname + " start <radius>");
                     return false;
                 }
                 if (!StringUtils.isNumeric(args[2])) {
-                    PlayerFunctions.sendMessage(plr, "INVALID RADIUS");
+                    MainUtil.sendMessage(plr, "INVALID RADIUS");
                     return false;
                 }
-                int radius = Integer.parseInt(args[2]);
+                final int radius = Integer.parseInt(args[2]);
-                Collection<Plot> plots = PlotMain.getPlots(worldname).values();
+                final Collection<Plot> plots = PlotSquared.getPlots(worldname).values();
-                int size = plots.size();
+                final int size = plots.size();
-                int minimum_radius = (int) Math.ceil((Math.sqrt(size)/2) + 1);
+                final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
                 if (radius < minimum_radius) {
-                    PlayerFunctions.sendMessage(plr, "RADIUS TOO SMALL");
+                    MainUtil.sendMessage(plr, "RADIUS TOO SMALL");
                     return false;
                 }
                 final List<PlotId> to_move = new ArrayList<>(getPlots(plots, radius));
                 final List<PlotId> free = new ArrayList<>();
-                PlotId start = new PlotId(0,0);
+                PlotId start = new PlotId(0, 0);
-                while (start.x <= minimum_radius && start.y <= minimum_radius) {
+                while ((start.x <= minimum_radius) && (start.y <= minimum_radius)) {
-                    Plot plot = PlotHelper.getPlot(world, start);
+                    final Plot plot = MainUtil.getPlot(worldname, start);
                     if (!plot.hasOwner()) {
                         free.add(plot.id);
                     }
                     start = Auto.getNextPlot(start, 1);
                 }
-                PlotHelper.move(world, to_move.get(0), free.get(0), new Runnable() {
+                MainUtil.move(worldname, to_move.get(0), free.get(0), new Runnable() {
                     @Override
                     public void run() {
                         if (!TASK) {
@@ -110,25 +104,25 @@ public class Condense extends SubCommand {
                         to_move.remove(0);
                         free.remove(0);
                         int index = 0;
-                        for (PlotId id : to_move) {
+                        for (final PlotId id : to_move) {
-                            Plot plot = PlotHelper.getPlot(world, id);
+                            final Plot plot = MainUtil.getPlot(worldname, id);
                             if (plot.hasOwner()) {
                                 break;
                             }
                             index++;
                         }
-                        for (int i = 0; i<index; i++) {
+                        for (int i = 0; i < index; i++) {
                             to_move.remove(0);
                         }
                         index = 0;
-                        for (PlotId id : free) {
+                        for (final PlotId id : free) {
-                            Plot plot = PlotHelper.getPlot(world, id);
+                            final Plot plot = MainUtil.getPlot(worldname, id);
                             if (!plot.hasOwner()) {
                                 break;
                             }
                             index++;
                         }
-                        for (int i = 0; i<index; i++) {
+                        for (int i = 0; i < index; i++) {
                             free.remove(0);
                         }
                         if (to_move.size() == 0) {
@@ -141,61 +135,61 @@ public class Condense extends SubCommand {
                             TASK = false;
                             return;
                         }
-                        sendMessage("MOVING " + to_move.get(0) +" to " + free.get(0));
+                        sendMessage("MOVING " + to_move.get(0) + " to " + free.get(0));
-                        PlotHelper.move(world, to_move.get(0), free.get(0), this);
+                        MainUtil.move(worldname, to_move.get(0), free.get(0), this);
                     }
                 });
                 TASK = true;
-                PlayerFunctions.sendMessage(plr, "TASK STARTED...");
+                MainUtil.sendMessage(plr, "TASK STARTED...");
                 return true;
             }
             case "stop": {
                 if (!TASK) {
-                    PlayerFunctions.sendMessage(plr, "TASK ALREADY STOPPED");
+                    MainUtil.sendMessage(plr, "TASK ALREADY STOPPED");
                     return false;
                 }
                 TASK = false;
-                PlayerFunctions.sendMessage(plr, "TASK STOPPED");
+                MainUtil.sendMessage(plr, "TASK STOPPED");
                 return true;
             }
             case "info": {
                 if (args.length == 2) {
-                    PlayerFunctions.sendMessage(plr, "/plot condense " + worldname + " info <radius>");
+                    MainUtil.sendMessage(plr, "/plot condense " + worldname + " info <radius>");
                     return false;
                 }
                 if (!StringUtils.isNumeric(args[2])) {
-                    PlayerFunctions.sendMessage(plr, "INVALID RADIUS");
+                    MainUtil.sendMessage(plr, "INVALID RADIUS");
                     return false;
                 }
-                int radius = Integer.parseInt(args[2]);
+                final int radius = Integer.parseInt(args[2]);
-                Collection<Plot> plots = PlotMain.getPlots(worldname).values();
+                final Collection<Plot> plots = PlotSquared.getPlots(worldname).values();
-                int size = plots.size();
+                final int size = plots.size();
-                int minimum_radius = (int) Math.ceil((Math.sqrt(size)/2) + 1);
+                final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
                 if (radius < minimum_radius) {
-                    PlayerFunctions.sendMessage(plr, "RADIUS TOO SMALL");
+                    MainUtil.sendMessage(plr, "RADIUS TOO SMALL");
                     return false;
                 }
-                int max_move = getPlots(plots, minimum_radius).size();
+                final int max_move = getPlots(plots, minimum_radius).size();
-                int user_move = getPlots(plots, radius).size();
+                final int user_move = getPlots(plots, radius).size();
-                PlayerFunctions.sendMessage(plr, "=== DEFAULT EVAL ===");
+                MainUtil.sendMessage(plr, "=== DEFAULT EVAL ===");
-                PlayerFunctions.sendMessage(plr, "MINIMUM RADIUS: " + minimum_radius);
+                MainUtil.sendMessage(plr, "MINIMUM RADIUS: " + minimum_radius);
-                PlayerFunctions.sendMessage(plr, "MAXIMUM MOVES: " + max_move);
+                MainUtil.sendMessage(plr, "MAXIMUM MOVES: " + max_move);
-                PlayerFunctions.sendMessage(plr, "=== INPUT EVAL ===");
+                MainUtil.sendMessage(plr, "=== INPUT EVAL ===");
-                PlayerFunctions.sendMessage(plr, "INPUT RADIUS: " + radius);
+                MainUtil.sendMessage(plr, "INPUT RADIUS: " + radius);
-                PlayerFunctions.sendMessage(plr, "ESTIMATED MOVES: " + user_move);
+                MainUtil.sendMessage(plr, "ESTIMATED MOVES: " + user_move);
-                PlayerFunctions.sendMessage(plr, "ESTIMATED TIME: " + "No idea, times will drastically change based on the system performance and load");
+                MainUtil.sendMessage(plr, "ESTIMATED TIME: " + "No idea, times will drastically change based on the system performance and load");
-                PlayerFunctions.sendMessage(plr, "&e - Radius is measured in plot width");
+                MainUtil.sendMessage(plr, "&e - Radius is measured in plot width");
                 return true;
             }
         }
-        PlayerFunctions.sendMessage(plr, "/plot condense " + worldname + " <start|stop|info> [radius]");
+        MainUtil.sendMessage(plr, "/plot condense " + worldname + " <start|stop|info> [radius]");
         return false;
     }
     
-    public Set<PlotId> getPlots(Collection<Plot> plots, int radius) {
+    public Set<PlotId> getPlots(final Collection<Plot> plots, final int radius) {
-        HashSet<PlotId> outside = new HashSet<>();
+        final HashSet<PlotId> outside = new HashSet<>();
-        for (Plot plot : plots) {
+        for (final Plot plot : plots) {
-            if (plot.id.x > radius || plot.id.x < -radius || plot.id.y > radius || plot.id.y < -radius) {
+            if ((plot.id.x > radius) || (plot.id.x < -radius) || (plot.id.y > radius) || (plot.id.y < -radius)) {
                 outside.add(plot.id);
             }
         }
@@ -203,7 +197,6 @@ public class Condense extends SubCommand {
     }
     
     public static void sendMessage(final String message) {
-        PlotMain.sendConsoleSenderMessage("&3PlotSquared -> Plot condense&8: &7" + message);
+        PlotSquared.log("&3PlotSquared -> Plot condense&8: &7" + message);
     }
-    
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Copy.java

@@ -1,65 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-package com.intellectualcrafters.plot.commands;
-
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotSelection;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-
-public class Copy extends SubCommand {
-
-    public Copy() {
-        super(Command.COPY, "Copy a plot", "copy", CommandCategory.ACTIONS, true);
-    }
-
-    @Override
-    public boolean execute(final Player plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
-            return false;
-        }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !PlotMain.hasPermission(plr, "plots.admin.command.copy")) {
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
-            return false;
-        }
-        assert plot != null;
-        if (plot.settings.isMerged()) {
-            PlayerFunctions.sendMessage(plr, C.UNLINK_REQUIRED);
-            return false;
-        }
-        final int size = (PlotHelper.getPlotTopLocAbs(plr.getWorld(), plot.getId()).getBlockX() - PlotHelper.getPlotBottomLocAbs(plr.getWorld(), plot.getId()).getBlockX());
-        final PlotSelection selection = new PlotSelection(size, plr.getWorld(), plot);
-        if (PlotSelection.currentSelection.containsKey(plr.getName())) {
-            PlotSelection.currentSelection.remove(plr.getName());
-        }
-        PlotSelection.currentSelection.put(plr.getName(), selection);
-        sendMessage(plr, C.CLIPBOARD_SET);
-        return true;
-    }
-}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java

@@ -18,45 +18,35 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.generator.HybridPlotManager;
 import com.intellectualcrafters.plot.generator.HybridPlotWorld;
+import com.intellectualcrafters.plot.generator.HybridUtils;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 public class CreateRoadSchematic extends SubCommand {
-
     public CreateRoadSchematic() {
         super(Command.CREATEROADSCHEMATIC, "Add a road schematic to your world using the road around your current plot", "crs", CommandCategory.DEBUG, true);
     }
     
     @Override
-    public boolean execute(final Player player, final String... args) {
+    public boolean execute(final PlotPlayer player, final String... args) {
-        
+        Location loc = player.getLocation();
-        if (!PlayerFunctions.isInPlot(player)) {
+        Plot plot = MainUtil.getPlot(loc);
-            PlayerFunctions.sendMessage(player, C.NOT_IN_PLOT);
+        if (plot == null) {
-            return false;
+            return sendMessage(player, C.NOT_IN_PLOT);
         }
-        
+        if (!(PlotSquared.getPlotWorld(loc.getWorld()) instanceof HybridPlotWorld)) {
-        if (!(PlotMain.getWorldSettings(player.getWorld()) instanceof HybridPlotWorld)) {
             return sendMessage(player, C.NOT_IN_PLOT_WORLD);
         }
-        
+        HybridUtils.manager.setupRoadSchematic(plot);
-        final Plot plot = PlayerFunctions.getCurrentPlot(player);
+        MainUtil.update(loc);
-
+        MainUtil.sendMessage(player, "&6Saved new road schematic");
-        HybridPlotManager manager = (HybridPlotManager) PlotMain.getPlotManager(player.getWorld());
-        
-        manager.setupRoadSchematic(plot);
-        PlotHelper.update(player.getLocation());
-        PlayerFunctions.sendMessage(player, "&6Saved new road schematic");
-        
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DEOP.java

@@ -1,34 +0,0 @@
-package com.intellectualcrafters.plot.commands;
-
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-
-/**
- * Created 2014-11-09 for PlotSquared
- *
- * @author Citymonstret
- */
-public class DEOP extends SubCommand {
-
-    public DEOP() {
-        super(Command.DEOP, "Alias for /plot trusted remove", "/plot deop  [player]", CommandCategory.ACTIONS, true);
-    }
-
-    @Override
-    public boolean execute(final Player plr, final String... args) {
-        if (args.length < 1) {
-            return PlayerFunctions.sendMessage(plr, "&cUsage: &c" + this.usage);
-        }
-        if (!PlayerFunctions.isInPlot(plr)) {
-            return sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if (!plot.hasRights(plr)) {
-            return sendMessage(plr, C.NO_PLOT_PERMS);
-        }
-        return plr.performCommand("plot trusted remove " + args[0]);
-    }
-}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java

@@ -7,16 +7,15 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.UUID;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.plugin.Plugin;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.MySQL;
 import com.intellectualcrafters.plot.database.SQLManager;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.StringComparison;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * Created 2014-11-15 for PlotSquared
@@ -24,8 +23,7 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
  * @author Citymonstret
  */
 public class Database extends SubCommand {
-
+    final String[] tables = new String[] { "plot_trusted", "plot_ratings", "plot_comments" };
-    final String[] tables = new String[]{"plot_trusted", "plot_ratings", "plot_comments"};
     
     public Database() {
         super(Command.DATABASE, "Convert/Backup Storage", "database [type] [...details]", CommandCategory.DEBUG, false);
@@ -33,11 +31,11 @@ public class Database extends SubCommand {
     
     private static boolean sendMessageU(final UUID uuid, final String msg) {
         if (uuid == null) {
-            PlotMain.sendConsoleSenderMessage(msg);
+            PlotSquared.log(msg);
         } else {
-            final Player p = UUIDHandler.uuidWrapper.getPlayer(uuid);
+            final PlotPlayer p = UUIDHandler.getPlayer(uuid);
             if ((p != null) && p.isOnline()) {
-                return PlayerFunctions.sendMessage(p, msg);
+                return MainUtil.sendMessage(p, msg);
             } else {
                 return sendMessageU(null, msg);
             }
@@ -46,9 +44,8 @@ public class Database extends SubCommand {
     }
     
     public static void insertPlots(final SQLManager manager, final UUID requester, final Connection c) {
-        final Plugin p = PlotMain.getMain();
+        final java.util.Set<Plot> plots = PlotSquared.getPlots();
-        final java.util.Set<Plot> plots = PlotMain.getPlots();
+        TaskManager.runTaskAsync(new Runnable() {
-        p.getServer().getScheduler().runTaskAsynchronously(p, new Runnable() {
             @Override
             public void run() {
                 try {
@@ -73,11 +70,11 @@ public class Database extends SubCommand {
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 1) {
             return sendMessage(plr, "/plot database [sqlite/mysql]");
         }
-        final String type = new StringComparison(args[0], new String[]{"mysql", "sqlite"}).getBestMatch().toLowerCase();
+        final String type = new StringComparison(args[0], new String[] { "mysql", "sqlite" }).getBestMatch().toLowerCase();
         switch (type) {
             case "mysql":
                 if (args.length < 6) {
@@ -94,7 +91,7 @@ public class Database extends SubCommand {
                 }
                 Connection n;
                 try {
-                    n = new MySQL(PlotMain.getMain(), host, port, database, username, password).openConnection();
+                    n = new MySQL(PlotSquared.THIS, host, port, database, username, password).openConnection();
                     // Connection
                     if (n.isClosed()) {
                         return sendMessage(plr, "Failed to open connection");
@@ -139,11 +136,11 @@ public class Database extends SubCommand {
         return false;
     }
     
-    private boolean sendMessage(final Player player, final String msg) {
+    private boolean sendMessage(final PlotPlayer player, final String msg) {
         if (player == null) {
-            PlotMain.sendConsoleSenderMessage(msg);
+            PlotSquared.log(msg);
         } else {
-            PlayerFunctions.sendMessage(player, msg);
+            MainUtil.sendMessage(player, msg);
         }
         return true;
     }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java

@@ -18,34 +18,28 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.Lag;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.RUtils;
 
 public class Debug extends SubCommand {
-
     public Debug() {
         super(Command.DEBUG, "Show debug information", "debug [msg]", CommandCategory.DEBUG, false);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if ((args.length > 0) && args[0].equalsIgnoreCase("msg")) {
             final StringBuilder msg = new StringBuilder();
             for (final C c : C.values()) {
                 msg.append(c.s()).append("\n");
             }
-            PlayerFunctions.sendMessage(plr, msg.toString());
+            MainUtil.sendMessage(plr, msg.toString());
             return true;
         }
         StringBuilder information;
@@ -58,9 +52,12 @@ public class Debug extends SubCommand {
         }
         {
             final StringBuilder worlds = new StringBuilder("");
-            for (final String world : PlotMain.getPlotWorlds()) {
+            for (final String world : PlotSquared.getPlotWorlds()) {
                 worlds.append(world).append(" ");
             }
+            
+            // FIXME not sure if we actually need any of this debug info as we should just do a timings report which is more detailed anyway
+            
             information.append(header);
             information.append(getSection(section, "Lag / TPS"));
             information.append(getLine(line, "Ticks Per Second", Lag.getTPS()));
@@ -68,16 +65,7 @@ public class Debug extends SubCommand {
             information.append(getLine(line, "TPS Percentage", (int) Lag.getFullPercentage() + "%"));
             information.append(getSection(section, "PlotWorld"));
             information.append(getLine(line, "Plot Worlds", worlds));
-            information.append(getLine(line, "Owned Plots", PlotMain.getPlots().size()));
+            information.append(getLine(line, "Owned Plots", PlotSquared.getPlots().size()));
-            // information.append(getLine(line, "PlotWorld Size",
-            // PlotHelper.getWorldFolderSize() + "MB"));
-            for (final String worldname : PlotMain.getPlotWorlds()) {
-                final World world = Bukkit.getWorld(worldname);
-                information.append(getLine(line, "World: " + world.getName() + " size", PlotHelper.getWorldFolderSize(world)));
-                information.append(getLine(line, " - Entities", PlotHelper.getEntities(world)));
-                information.append(getLine(line, " - Loaded Tile Entities", PlotHelper.getTileEntities(world)));
-                information.append(getLine(line, " - Loaded Chunks", PlotHelper.getLoadedChunks(world)));
-            }
             information.append(getSection(section, "RAM"));
             information.append(getLine(line, "Free Ram", RUtils.getFreeRam() + "MB"));
             information.append(getLine(line, "Total Ram", RUtils.getTotalRam() + "MB"));
@@ -86,7 +74,7 @@ public class Debug extends SubCommand {
             information.append(getLine(line, "View all captions", "/plot debug msg"));
         }
         {
-            PlayerFunctions.sendMessage(plr, information.toString());
+            MainUtil.sendMessage(plr, information.toString());
         }
         return true;
     }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java

@@ -18,123 +18,100 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.Sign;
-import org.bukkit.entity.Player;
-
 import com.google.common.collect.BiMap;
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.events.PlayerClaimPlotEvent;
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.StringWrapper;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.AChunkManager;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.BlockManager;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * @author Citymonstret
  */
 public class DebugClaimTest extends SubCommand {
-
     public DebugClaimTest() {
         super(Command.DEBUGCLAIMTEST, "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the plot signs. Execution time may vary", "debugclaimtest", CommandCategory.DEBUG, false);
     }
     
-    @SuppressWarnings("unused")
+    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport) {
-    public static boolean claimPlot(final Player player, final Plot plot, final boolean teleport) {
         return claimPlot(player, plot, teleport, "");
     }
     
-    public static boolean claimPlot(final Player player, final Plot plot, final boolean teleport, @SuppressWarnings("unused") final String schematic) {
+    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final String schematic) {
-        final PlayerClaimPlotEvent event = new PlayerClaimPlotEvent(player, plot, true);
+        // FIXME call claim event
-        Bukkit.getPluginManager().callEvent(event);
+        // boolean result = event result
-        if (!event.isCancelled()) {
+        boolean result = true;
-            PlotHelper.createPlot(player, plot);
+        
-            PlotHelper.setSign(player, plot);
+        if (!result) {
-            PlayerFunctions.sendMessage(player, C.CLAIMED);
+            MainUtil.createPlot(player.getUUID(), plot);
+            MainUtil.setSign(player.getName(), plot);
+            MainUtil.sendMessage(player, C.CLAIMED);
             if (teleport) {
-                PlotMain.teleportPlayer(player, player.getLocation(), plot);
+                MainUtil.teleportPlayer(player, player.getLocation(), plot);
             }
         }
-        return event.isCancelled();
+        return result;
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr == null) {
             if (args.length < 3) {
-                return !PlayerFunctions.sendMessage(null, "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the plot signs. \n\n&cMissing world arg /plot debugclaimtest {world} {PlotId min} {PlotId max}");
+                return !MainUtil.sendMessage(null, "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the plot signs. \n\n&cMissing world arg /plot debugclaimtest {world} {PlotId min} {PlotId max}");
             }
-            final World world = Bukkit.getWorld(args[0]);
+            String world = args[0];
-            if ((world == null) || !PlotMain.isPlotWorld(world)) {
+            if (!BlockManager.manager.isWorld(world) || !PlotSquared.isPlotWorld(world)) {
-                return !PlayerFunctions.sendMessage(null, "&cInvalid plot world!");
+                return !MainUtil.sendMessage(null, "&cInvalid plot world!");
             }
-
             PlotId min, max;
-
             try {
                 final String[] split1 = args[1].split(";");
                 final String[] split2 = args[2].split(";");
-
                 min = new PlotId(Integer.parseInt(split1[0]), Integer.parseInt(split1[1]));
                 max = new PlotId(Integer.parseInt(split2[0]), Integer.parseInt(split2[1]));
             } catch (final Exception e) {
-                return !PlayerFunctions.sendMessage(null, "&cInvalid min/max values. &7The values are to Plot IDs in the format &cX;Y &7where X,Y are the plot coords\nThe conversion will only check the plots in the selected area.");
+                return !MainUtil.sendMessage(null, "&cInvalid min/max values. &7The values are to Plot IDs in the format &cX;Y &7where X,Y are the plot coords\nThe conversion will only check the plots in the selected area.");
             }
-            PlayerFunctions.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Beginning sign to plot conversion. This may take a while...");
+            MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Beginning sign to plot conversion. This may take a while...");
-            PlayerFunctions.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: Found an excess of 250,000 chunks. Limiting search radius... (~3.8 min)");
+            MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: Found an excess of 250,000 chunks. Limiting search radius... (~3.8 min)");
-
+            final PlotManager manager = PlotSquared.getPlotManager(world);
-            final PlotManager manager = PlotMain.getPlotManager(world);
+            final PlotWorld plotworld = PlotSquared.getPlotWorld(world);
-            final PlotWorld plotworld = PlotMain.getWorldSettings(world);
-
             final ArrayList<Plot> plots = new ArrayList<>();
-
+            for (final PlotId id : MainUtil.getPlotSelectionIds(min, max)) {
-            for (final PlotId id : PlayerFunctions.getPlotSelectionIds(min, max)) {
+                final Plot plot = MainUtil.getPlot(world, id);
-                final Plot plot = PlotHelper.getPlot(world, id);
+                final boolean contains = PlotSquared.getPlots(world).containsKey(plot.id);
-                final boolean contains = PlotMain.getPlots(world).containsKey(plot.id);
                 if (contains) {
-                    PlayerFunctions.sendMessage(null, " - &cDB Already contains: " + plot.id);
+                    MainUtil.sendMessage(null, " - &cDB Already contains: " + plot.id);
                     continue;
                 }
-
+                final Location loc = manager.getSignLoc(plotworld, plot);
-                final Location loc = manager.getSignLoc(world, plotworld, plot);
+                ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
-
+                boolean result = AChunkManager.manager.loadChunk(world, chunk);
-                final Chunk chunk = world.getChunkAt(loc);
-
-                if (!chunk.isLoaded()) {
-                    final boolean result = chunk.load(false);
                 if (!result) {
                     continue;
                 }
-                }
+                String[] lines = BlockManager.manager.getSign(loc);
-
+                if (lines != null) {
-                final Block block = world.getBlockAt(loc);
+                    String line = lines[2];
-                if (block != null) {
-                    if (block.getState() instanceof Sign) {
-                        final Sign sign = (Sign) block.getState();
-                        String line = sign.getLine(2);
                     if ((line != null) && (line.length() > 2)) {
                         line = line.substring(2);
-
                         final BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
-
                         UUID uuid = (map.get(new StringWrapper(line)));
-
                         if (uuid == null) {
                             for (final StringWrapper string : map.keySet()) {
                                 if (string.value.toLowerCase().startsWith(line.toLowerCase())) {
@@ -147,35 +124,29 @@ public class DebugClaimTest extends SubCommand {
                             uuid = UUIDHandler.getUUID(line);
                         }
                         if (uuid != null) {
-                                PlayerFunctions.sendMessage(null, " - &aFound plot: " + plot.id + " : " + line);
+                            MainUtil.sendMessage(null, " - &aFound plot: " + plot.id + " : " + line);
                             plot.owner = uuid;
                             plot.hasChanged = true;
                             plots.add(plot);
                         } else {
-                                PlayerFunctions.sendMessage(null, " - &cInvalid playername: " + plot.id + " : " + line);
+                            MainUtil.sendMessage(null, " - &cInvalid playername: " + plot.id + " : " + line);
                         }
                     }
                 }
             }
-            }
-
             if (plots.size() > 0) {
-                PlayerFunctions.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Updating '" + plots.size() + "' plots!");
+                MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Updating '" + plots.size() + "' plots!");
                 DBFunc.createPlots(plots);
                 DBFunc.createAllSettingsAndHelpers(plots);
-
                 for (final Plot plot : plots) {
-                    PlotMain.updatePlot(plot);
+                    PlotSquared.updatePlot(plot);
                 }
-
+                MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Complete!");
-                PlayerFunctions.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Complete!");
-
             } else {
-                PlayerFunctions.sendMessage(null, "No plots were found for the given search.");
+                MainUtil.sendMessage(null, "No plots were found for the given search.");
             }
-
         } else {
-            PlayerFunctions.sendMessage(plr, "&6This command can only be executed by console as it has been deemed unsafe if abused.");
+            MainUtil.sendMessage(plr, "&6This command can only be executed by console as it has been deemed unsafe if abused.");
         }
         return true;
     }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java

@@ -18,63 +18,57 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.generator.SquarePlotWorld;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.ChunkManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.bukkit.ChunkManager;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class DebugClear extends SubCommand {
-
     public DebugClear() {
         super(Command.DEBUGCLEAR, "Clear a plot using a fast experimental algorithm", "debugclear", CommandCategory.DEBUG, false);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr == null) {
             // Is console
             if (args.length < 2) {
-                PlotMain.sendConsoleSenderMessage("You need to specify two arguments: ID (0;0) & World (world)");
+                PlotSquared.log("You need to specify two arguments: ID (0;0) & World (world)");
             } else {
                 final PlotId id = PlotId.fromString(args[0]);
                 final String world = args[1];
                 if (id == null) {
-                    PlotMain.sendConsoleSenderMessage("Invalid Plot ID: " + args[0]);
+                    PlotSquared.log("Invalid Plot ID: " + args[0]);
                 } else {
-                    if (!PlotMain.isPlotWorld(world) || !(PlotMain.getWorldSettings(world) instanceof SquarePlotWorld)) {
+                    if (!PlotSquared.isPlotWorld(world) || !(PlotSquared.getPlotWorld(world) instanceof SquarePlotWorld)) {
-                        PlotMain.sendConsoleSenderMessage("Invalid plot world: " + world);
+                        PlotSquared.log("Invalid plot world: " + world);
                     } else {
-                        final Plot plot = PlotHelper.getPlot(Bukkit.getWorld(world), id);
+                        final Plot plot = MainUtil.getPlot(world, id);
                         if (plot == null) {
-                            PlotMain.sendConsoleSenderMessage("Could not find plot " + args[0] + " in world " + world);
+                            PlotSquared.log("Could not find plot " + args[0] + " in world " + world);
                         } else {
-                            World bukkitWorld = Bukkit.getWorld(world);
+                            final Location pos1 = MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1);
-                            Location pos1 = PlotHelper.getPlotBottomLoc(bukkitWorld, plot.id).add(1, 0, 1);
+                            final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id);
-                            Location pos2 = PlotHelper.getPlotTopLoc(bukkitWorld, plot.id);
+                            if (MainUtil.runners.containsKey(plot)) {
-                            if (PlotHelper.runners.containsKey(plot)) {
+                                MainUtil.sendMessage(null, C.WAIT_FOR_TIMER);
-                                PlayerFunctions.sendMessage(null, C.WAIT_FOR_TIMER);
                                 return false;
                             }
-                            PlotHelper.runners.put(plot, 1);
+                            MainUtil.runners.put(plot, 1);
-                            ChunkManager.regenerateRegion(pos1, pos2, new Runnable() {
+                            ChunkManager.manager.regenerateRegion(pos1, pos2, new Runnable() {
                                 @Override
                                 public void run() {
-                                    PlotHelper.runners.remove(plot);
+                                    MainUtil.runners.remove(plot);
-                                    PlotMain.sendConsoleSenderMessage("Plot " + plot.getId().toString() + " cleared.");
+                                    PlotSquared.log("Plot " + plot.getId().toString() + " cleared.");
-                                    PlotMain.sendConsoleSenderMessage("&aDone!");
+                                    PlotSquared.log("&aDone!");
                                 }
                             });
                         }
@@ -83,38 +77,34 @@ public class DebugClear extends SubCommand {
             }
             return true;
         }
-
+        Location loc = plr.getLocation();
-        if (!PlayerFunctions.isInPlot(plr) || !(PlotMain.getWorldSettings(plr.getWorld()) instanceof SquarePlotWorld)) {
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null || !(PlotSquared.getPlotWorld(loc.getWorld()) instanceof SquarePlotWorld)) {
             return sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
+        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
-        if (!PlayerFunctions.getTopPlot(plr.getWorld(), plot).equals(PlayerFunctions.getBottomPlot(plr.getWorld(), plot))) {
             return sendMessage(plr, C.UNLINK_REQUIRED);
         }
-        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !PlotMain.hasPermission(plr, "plots.admin.command.debugclear")) {
+        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.debugclear")) {
             return sendMessage(plr, C.NO_PLOT_PERMS);
         }
         assert plot != null;
-        World bukkitWorld = plr.getWorld();
+        final Location pos1 = MainUtil.getPlotBottomLoc(loc.getWorld(), plot.id).add(1, 0, 1);
-        Location pos1 = PlotHelper.getPlotBottomLoc(bukkitWorld, plot.id).add(1, 0, 1);
+        final Location pos2 = MainUtil.getPlotTopLoc(loc.getWorld(), plot.id);
-        Location pos2 = PlotHelper.getPlotTopLoc(bukkitWorld, plot.id);
+        if (MainUtil.runners.containsKey(plot)) {
-        if (PlotHelper.runners.containsKey(plot)) {
+            MainUtil.sendMessage(null, C.WAIT_FOR_TIMER);
-            PlayerFunctions.sendMessage(null, C.WAIT_FOR_TIMER);
             return false;
         }
-        PlotHelper.runners.put(plot, 1);
+        MainUtil.runners.put(plot, 1);
-        ChunkManager.regenerateRegion(pos1, pos2, new Runnable() {
+        ChunkManager.manager.regenerateRegion(pos1, pos2, new Runnable() {
             @Override
             public void run() {
-                PlotHelper.runners.remove(plot);
+                MainUtil.runners.remove(plot);
-                PlayerFunctions.sendMessage(plr, "&aDone!");
+                MainUtil.sendMessage(plr, "&aDone!");
             }
         });
-
         // sign
-
         // wall
-
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.io.File;
@@ -34,129 +33,125 @@ import java.util.UUID;
 
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.PlotSquared;
+import com.intellectualcrafters.plot.object.BukkitOfflinePlayer;
 import com.intellectualcrafters.plot.object.ChunkLoc;
 import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.ExpireManager;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class DebugExec extends SubCommand {
-
-    private ArrayList<ChunkLoc> chunks = null;
-    private World world;
-
     public DebugExec() {
         super("debugexec", "plots.admin", "Multi-purpose debug command", "debugexec", "exec", CommandCategory.DEBUG, false);
     }
     
     @Override
-    public boolean execute(final Player player, final String... args) {
+    public boolean execute(final PlotPlayer player, final String... args) {
-    	List<String> allowed_params = Arrays.asList(new String[]{"stop-expire","start-expire", "show-expired", "update-expired", "seen", "trim-check"});
+        final List<String> allowed_params = Arrays.asList(new String[] { "stop-expire", "start-expire", "show-expired", "update-expired", "seen", "trim-check" });
         if (args.length > 0) {
-        	String arg = args[0].toLowerCase();
+            final String arg = args[0].toLowerCase();
             switch (arg) {
                 case "stop-expire": {
                     if (ExpireManager.task != -1) {
                         Bukkit.getScheduler().cancelTask(ExpireManager.task);
-	        		}
+                    } else {
-	        		else {
+                        return MainUtil.sendMessage(null, "Task already halted");
-	        			return PlayerFunctions.sendMessage(null, "Task already halted");
                     }
                     ExpireManager.task = -1;
-	        		return PlayerFunctions.sendMessage(null, "Cancelled task.");
+                    return MainUtil.sendMessage(null, "Cancelled task.");
                 }
                 case "start-expire": {
                     if (ExpireManager.task == -1) {
                         ExpireManager.runTask();
+                    } else {
+                        return MainUtil.sendMessage(null, "Plot expiry task already started");
                     }
-	        		else {
+                    return MainUtil.sendMessage(null, "Started plot expiry task");
-	        			return PlayerFunctions.sendMessage(null, "Plot expiry task already started");
-	        		}
-	        		return PlayerFunctions.sendMessage(null, "Started plot expiry task");
                 }
                 case "update-expired": {
                     if (args.length > 1) {
-	        			World world = Bukkit.getWorld(args[1]);
+                        final String world = args[1];
-	        			if (world == null) {
+                        if (!BlockManager.manager.isWorld(world)) {
-	        				return PlayerFunctions.sendMessage(null, "Invalid world: "+args[1]);
+                            return MainUtil.sendMessage(null, "Invalid world: " + args[1]);
                         }
-	        			PlayerFunctions.sendMessage(null, "Updating expired plot list");
+                        MainUtil.sendMessage(null, "Updating expired plot list");
                         ExpireManager.updateExpired(args[1]);
                         return true;
                     }
-	        		return PlayerFunctions.sendMessage(null, "Use /plot debugexec update-expired <world>");
+                    return MainUtil.sendMessage(null, "Use /plot debugexec update-expired <world>");
                 }
                 case "show-expired": {
                     if (args.length > 1) {
-	        			World world = Bukkit.getWorld(args[1]);
+                        final String world = args[1];
-	        			if (world == null || !ExpireManager.expiredPlots.containsKey(args[1])) {
+                        if (!BlockManager.manager.isWorld(world)) {
-	        				return PlayerFunctions.sendMessage(null, "Invalid world: "+args[1]);
+                            return MainUtil.sendMessage(null, "Invalid world: " + args[1]);
                         }
-	        			PlayerFunctions.sendMessage(null, "Expired plots (" + ExpireManager.expiredPlots.get(args[1]).size() + "):");
+                        if (!ExpireManager.expiredPlots.containsKey(args[1])) {
-	        			for (Entry<Plot, Long> entry : ExpireManager.expiredPlots.get(args[1]).entrySet()) {
+                            return MainUtil.sendMessage(null, "No task for world: " + args[1]);
-	        			    Plot plot = entry.getKey();
+                        }
-	        			    Long stamp = entry.getValue();
+                        MainUtil.sendMessage(null, "Expired plots (" + ExpireManager.expiredPlots.get(args[1]).size() + "):");
-	        				PlayerFunctions.sendMessage(null, " - " + plot.world + ";" + plot.id.x + ";" + plot.id.y + ";" + UUIDHandler.getName(plot.owner) +" : " + stamp);
+                        for (final Entry<Plot, Long> entry : ExpireManager.expiredPlots.get(args[1]).entrySet()) {
+                            final Plot plot = entry.getKey();
+                            final Long stamp = entry.getValue();
+                            MainUtil.sendMessage(null, " - " + plot.world + ";" + plot.id.x + ";" + plot.id.y + ";" + UUIDHandler.getName(plot.owner) + " : " + stamp);
                         }
                         return true;
                     }
-	        		return PlayerFunctions.sendMessage(null, "Use /plot debugexec show-expired <world>");
+                    return MainUtil.sendMessage(null, "Use /plot debugexec show-expired <world>");
                 }
                 case "seen": {
                     if (args.length != 2) {
-	        	        return PlayerFunctions.sendMessage(null, "Use /plot debugexec seen <player>");
+                        return MainUtil.sendMessage(null, "Use /plot debugexec seen <player>");
                     }
-	        	    UUID uuid = UUIDHandler.getUUID(args[1]);
+                    final UUID uuid = UUIDHandler.getUUID(args[1]);
                     if (uuid == null) {
-	        	        return PlayerFunctions.sendMessage(null, "player not found: " + args[1]);
+                        return MainUtil.sendMessage(null, "player not found: " + args[1]);
                     }
-	        	    OfflinePlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid);
+                    BukkitOfflinePlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid);
-	        	    if (op == null || !op.hasPlayedBefore()) {
+                    if ((op == null) || op.getLastPlayed() == 0) {
-	        	        return PlayerFunctions.sendMessage(null, "player hasn't connected before: " + args[1]);
+                        return MainUtil.sendMessage(null, "player hasn't connected before: " + args[1]);
                     }
-	        	    Timestamp stamp = new Timestamp(op.getLastPlayed());
+                    final Timestamp stamp = new Timestamp(op.getLastPlayed());
-	        	    Date date = new Date(stamp.getTime());
+                    final Date date = new Date(stamp.getTime());
-	        	    PlayerFunctions.sendMessage(null, "PLAYER: " + args[1]);
+                    MainUtil.sendMessage(null, "PLAYER: " + args[1]);
-	        	    PlayerFunctions.sendMessage(null, "UUID: " + uuid);
+                    MainUtil.sendMessage(null, "UUID: " + uuid);
-	        	    PlayerFunctions.sendMessage(null, "Object: " + date.toGMTString());
+                    MainUtil.sendMessage(null, "Object: " + date.toGMTString());
-	        	    PlayerFunctions.sendMessage(null, "GMT: " + date.toGMTString());
+                    MainUtil.sendMessage(null, "GMT: " + date.toGMTString());
-	        	    PlayerFunctions.sendMessage(null, "Local: " + date.toLocaleString());
+                    MainUtil.sendMessage(null, "Local: " + date.toLocaleString());
                     return true;
                 }
                 case "trim-check": {
                     if (args.length != 2) {
-	        	        PlayerFunctions.sendMessage(null, "Use /plot debugexec trim-check <world>");
+                        MainUtil.sendMessage(null, "Use /plot debugexec trim-check <world>");
-	        	        PlayerFunctions.sendMessage(null, "&7 - Generates a list of regions to trim");
+                        MainUtil.sendMessage(null, "&7 - Generates a list of regions to trim");
-	        	        return PlayerFunctions.sendMessage(null, "&7 - Run after plot expiry has run");
+                        return MainUtil.sendMessage(null, "&7 - Run after plot expiry has run");
                     }
-	        	    final World world = Bukkit.getWorld(args[1]);
+                    final String world = args[1];
-	        	    if (world == null || !PlotMain.isPlotWorld(args[1])) {
+                    if (!BlockManager.manager.isWorld(world) || !PlotSquared.isPlotWorld(args[1])) {
-                        return PlayerFunctions.sendMessage(null, "Invalid world: "+args[1]);
+                        return MainUtil.sendMessage(null, "Invalid world: " + args[1]);
                     }
                     final ArrayList<ChunkLoc> empty = new ArrayList<>();
-	        	    boolean result = Trim.getTrimRegions(empty, world, new Runnable() {
+                    final boolean result = Trim.getTrimRegions(empty, world, new Runnable() {
                         @Override
                         public void run() {
                             Trim.sendMessage("Processing is complete! Here's how many chunks would be deleted:");
                             Trim.sendMessage(" - MCA #: " + empty.size());
                             Trim.sendMessage(" - CHUNKS: " + (empty.size() * 1024) + " (max)");
                             Trim.sendMessage("Exporting log for manual approval...");
-                            final File file = new File(PlotMain.getMain().getDataFolder() + File.separator + "trim.txt");
+                            final File file = new File(PlotSquared.IMP.getDirectory() + File.separator + "trim.txt");
                             PrintWriter writer;
                             try {
                                 writer = new PrintWriter(file);
-                                String worldname = world.getName();
+                                for (final ChunkLoc loc : empty) {
-                                for (ChunkLoc loc : empty) {
+                                    writer.println(world + "/region/r." + loc.x + "." + loc.z + ".mca");
-                                    writer.println(worldname +"/region/r." + loc.x + "." + loc.z +".mca" );
                                 }
                                 writer.close();
                                 Trim.sendMessage("File saved to 'plugins/PlotSquared/trim.txt'");
-                            } catch (FileNotFoundException e) {
+                            } catch (final FileNotFoundException e) {
                                 e.printStackTrace();
                                 Trim.sendMessage("File failed to save! :(");
                             }
@@ -167,13 +162,13 @@ public class DebugExec extends SubCommand {
                         }
                     });
                     if (!result) {
-	        	        PlayerFunctions.sendMessage(null, "Trim task already started!");
+                        MainUtil.sendMessage(null, "Trim task already started!");
                     }
                     return result;
                 }
             }
         }
-    	PlayerFunctions.sendMessage(player, "Possible sub commands: /plot debugexec <" + StringUtils.join(allowed_params, "|") + ">");
+        MainUtil.sendMessage(player, "Possible sub commands: /plot debugexec <" + StringUtils.join(allowed_params, "|") + ">");
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java

@@ -18,65 +18,60 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 import java.util.Set;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.flag.AbstractFlag;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 public class DebugFixFlags extends SubCommand {
-
     public DebugFixFlags() {
         super(Command.DEBUGFIXFLAGS, "Attempt to fix all flags for a world", "debugclear", CommandCategory.DEBUG, false);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr != null) {
-            PlayerFunctions.sendMessage(plr, C.NOT_CONSOLE);
+            MainUtil.sendMessage(plr, C.NOT_CONSOLE);
             return false;
         }
         if (args.length != 1) {
-            PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot debugfixflags <world>");
+            MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot debugfixflags <world>");
             return false;
         }
-        World world = Bukkit.getWorld(args[0]);
+        final String world = args[0];
-        if (world == null || !PlotMain.isPlotWorld(world)) {
+        if (!BlockManager.manager.isWorld(world) || !PlotSquared.isPlotWorld(world)) {
-            PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_WORLD, args[0]);
+            MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD, args[0]);
             return false;
         }
-        PlayerFunctions.sendMessage(plr, "&8--- &6Starting task &8 ---");
+        MainUtil.sendMessage(plr, "&8--- &6Starting task &8 ---");
-        for (Plot plot : PlotMain.getPlots(world).values()) {
+        for (final Plot plot : PlotSquared.getPlots(world).values()) {
-            Set<Flag> flags = plot.settings.flags;
+            final Set<Flag> flags = plot.settings.flags;
-            ArrayList<Flag> toRemove = new ArrayList<Flag>();
+            final ArrayList<Flag> toRemove = new ArrayList<Flag>();
-            for (Flag flag : flags) {
+            for (final Flag flag : flags) {
-                AbstractFlag af = FlagManager.getFlag(flag.getKey());
+                final AbstractFlag af = FlagManager.getFlag(flag.getKey());
                 if (af == null) {
                     toRemove.add(flag);
                 }
             }
-            for (Flag flag : toRemove) {
+            for (final Flag flag : toRemove) {
                 plot.settings.flags.remove(flag);
             }
             if (toRemove.size() > 0) {
                 DBFunc.setFlags(plot.world, plot, plot.settings.flags);
             }
         }
-        PlayerFunctions.sendMessage(plr, "&aDone!");
+        MainUtil.sendMessage(plr, "&aDone!");
-        
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java

@@ -18,40 +18,37 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.lang.reflect.Field;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 /**
  * @author Citymonstret
  */
 public class DebugLoadTest extends SubCommand {
-
     public DebugLoadTest() {
         super(Command.DEBUGLOADTEST, "This debug command will force the reload of all plots in the DB", "debugloadtest", CommandCategory.DEBUG, false);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr == null) {
             try {
-                final Field fPlots = PlotMain.class.getDeclaredField("plots");
+                final Field fPlots = PlotSquared.class.getDeclaredField("plots");
                 fPlots.setAccessible(true);
                 fPlots.set(null, DBFunc.getPlots());
             } catch (final Exception e) {
-                PlotMain.sendConsoleSenderMessage("&3===FAILED&3===");
+                PlotSquared.log("&3===FAILED&3===");
                 e.printStackTrace();
-                PlotMain.sendConsoleSenderMessage("&3===END OF STACKTRACE===");
+                PlotSquared.log("&3===END OF STACKTRACE===");
             }
         } else {
-            PlayerFunctions.sendMessage(plr, "&6This command can only be executed by console as it has been deemed unsafe if abused..");
+            MainUtil.sendMessage(plr, "&6This command can only be executed by console as it has been deemed unsafe if abused..");
         }
         return true;
     }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java

@@ -18,40 +18,35 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import java.util.Arrays;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import org.bukkit.Chunk;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.generator.HybridPlotManager;
 import com.intellectualcrafters.plot.generator.HybridPlotWorld;
-import com.intellectualcrafters.plot.util.AbstractSetBlock;
+import com.intellectualcrafters.plot.generator.HybridUtils;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 public class DebugRoadRegen extends SubCommand {
-
     public DebugRoadRegen() {
         super(Command.DEBUGROADREGEN, "Regenerate all road schematic in your current chunk", "debugroadregen", CommandCategory.DEBUG, true);
     }
     
     @Override
-    public boolean execute(final Player player, final String... args) {
+    public boolean execute(final PlotPlayer player, final String... args) {
-        if (!(PlotMain.getWorldSettings(player.getWorld()) instanceof HybridPlotWorld)) {
+        Location loc = player.getLocation();
+        String world = loc.getWorld();
+        if (!(PlotSquared.getPlotWorld(world) instanceof HybridPlotWorld)) {
             return sendMessage(player, C.NOT_IN_PLOT_WORLD);
         }
-        HybridPlotManager manager = (HybridPlotManager) PlotMain.getPlotManager(player.getWorld());
+        ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
-        
+        boolean result = HybridUtils.manager.regenerateRoad(world, chunk);
-        Chunk chunk = player.getLocation().getChunk();
-        boolean result = manager.regenerateRoad(chunk);
         if (result) {
-            AbstractSetBlock.setBlockManager.update(Arrays.asList(new Chunk[] {chunk}));
+            MainUtil.update(loc);
         }
-        PlayerFunctions.sendMessage(player, "&6Regenerating chunk: "+chunk.getX() + "," + chunk.getZ() + "\n&6 - Result: " + (result == true ? "&aSuccess" : "&cFailed"));
+        MainUtil.sendMessage(player, "&6Regenerating chunk: " + chunk.x + "," + chunk.z + "\n&6 - Result: " + (result == true ? "&aSuccess" : "&cFailed"));
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java

@@ -18,36 +18,33 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 /**
  * @author Citymonstret
  */
 public class DebugSaveTest extends SubCommand {
-
     public DebugSaveTest() {
         super(Command.DEBUGSAVETEST, "This debug command will force the recreation of all plots in the DB", "debugsavetest", CommandCategory.DEBUG, false);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr == null) {
             final ArrayList<Plot> plots = new ArrayList<Plot>();
-            plots.addAll(PlotMain.getPlots());
+            plots.addAll(PlotSquared.getPlots());
             DBFunc.createPlots(plots);
             DBFunc.createAllSettingsAndHelpers(plots);
         } else {
-            PlayerFunctions.sendMessage(plr, "This debug command can only be executed by console as it has been deemed unsafe if abused");
+            MainUtil.sendMessage(plr, "This debug command can only be executed by console as it has been deemed unsafe if abused");
         }
         return true;
     }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java

@@ -18,55 +18,66 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import net.milkbowl.vault.economy.Economy;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.EconHandler;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class Delete extends SubCommand {
-
     public Delete() {
         super(Command.DELETE, "Delete a plot", "delete", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) {
             return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
+        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
-        if (!PlayerFunctions.getTopPlot(plr.getWorld(), plot).equals(PlayerFunctions.getBottomPlot(plr.getWorld(), plot))) {
             return !sendMessage(plr, C.UNLINK_REQUIRED);
         }
-        if ((((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.uuidWrapper.getUUID(plr)))) && !PlotMain.hasPermission(plr, "plots.admin.command.delete")) {
+        if ((((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.uuidWrapper.getUUID(plr)))) && !Permissions.hasPermission(plr, "plots.admin.command.delete")) {
             return !sendMessage(plr, C.NO_PLOT_PERMS);
         }
         assert plot != null;
-        final PlotWorld pWorld = PlotMain.getWorldSettings(plot.getWorld());
+        final PlotWorld pWorld = PlotSquared.getPlotWorld(plot.world);
-        if (PlotMain.useEconomy && pWorld.USE_ECONOMY && (plot != null) && plot.hasOwner() && plot.getOwner().equals(UUIDHandler.getUUID(plr))) {
+        if (PlotSquared.economy != null && pWorld.USE_ECONOMY && (plot != null) && plot.hasOwner() && plot.getOwner().equals(UUIDHandler.getUUID(plr))) {
             final double c = pWorld.SELL_PRICE;
             if (c > 0d) {
-                final Economy economy = PlotMain.economy;
+                EconHandler.depositPlayer(plr, c);
-                economy.depositPlayer(plr, c);
                 sendMessage(plr, C.ADDED_BALANCE, c + "");
             }
         }
-        final boolean result = PlotMain.removePlot(plr.getWorld().getName(), plot.id, true);
+        if (MainUtil.runners.containsKey(plot)) {
+            MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
+            return false;
+        }
+        final boolean result = PlotSquared.removePlot(loc.getWorld(), plot.id, true);
+        final long start = System.currentTimeMillis();
         if (result) {
-            plot.clear(plr, true);
+            boolean result2 = MainUtil.clearAsPlayer(plot, false, new Runnable() {
-            DBFunc.delete(plr.getWorld().getName(), plot);
+                @Override
+                public void run() {
+                    MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));
+                }
+            });
+            if (!result2) {
+                MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
+            }
+            DBFunc.delete(loc.getWorld(), plot);
         } else {
-            PlayerFunctions.sendMessage(plr, "Plot deletion has been denied.");
+            MainUtil.sendMessage(plr, "Plot deletion has been denied.");
         }
         return true;
     }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java

@@ -18,110 +18,104 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.events.PlayerPlotDeniedEvent;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.BlockManager;
-
+import com.intellectualcrafters.plot.util.MainUtil;
-@SuppressWarnings("deprecation") public class Denied extends SubCommand {
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
+public class Denied extends SubCommand {
     public Denied() {
         super(Command.DENIED, "Manage plot helpers", "denied {add|remove} {player}", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 2) {
-            PlayerFunctions.sendMessage(plr, C.DENIED_NEED_ARGUMENT);
+            MainUtil.sendMessage(plr, C.DENIED_NEED_ARGUMENT);
             return true;
         }
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
-            return true;
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
         if ((plot == null) || !plot.hasOwner()) {
-            PlayerFunctions.sendMessage(plr, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !PlotMain.hasPermission(plr, "plots.admin.command.denied")) {
+        if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !Permissions.hasPermission(plr, "plots.admin.command.denied")) {
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
+            MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         if (args[0].equalsIgnoreCase("add")) {
             UUID uuid;
             if (args[1].equalsIgnoreCase("*")) {
                 uuid = DBFunc.everyone;
-
             } else {
                 uuid = UUIDHandler.getUUID(args[1]);
             }
             if (uuid == null) {
-                PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER, args[1]);
+                MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]);
                 return false;
             }
             if (!plot.denied.contains(uuid)) {
                 if (plot.owner.equals(uuid)) {
-                    PlayerFunctions.sendMessage(plr, C.ALREADY_OWNER);
+                    MainUtil.sendMessage(plr, C.ALREADY_OWNER);
                     return false;
                 }
                 if (plot.trusted.contains(uuid)) {
                     plot.trusted.remove(uuid);
-                    DBFunc.removeTrusted(plr.getWorld().getName(), plot, uuid);
+                    DBFunc.removeTrusted(loc.getWorld(), plot, uuid);
                 }
                 if (plot.helpers.contains(uuid)) {
                     plot.helpers.remove(uuid);
-                    DBFunc.removeHelper(plr.getWorld().getName(), plot, uuid);
+                    DBFunc.removeHelper(loc.getWorld(), plot, uuid);
                 }
                 plot.addDenied(uuid);
-                DBFunc.setDenied(plr.getWorld().getName(), plot, uuid);
+                DBFunc.setDenied(loc.getWorld(), plot, uuid);
-                final PlayerPlotDeniedEvent event = new PlayerPlotDeniedEvent(plr, plot, uuid, true);
+                //FIXME PlayerPlotDeniedEvent
-                Bukkit.getPluginManager().callEvent(event);
             } else {
-                PlayerFunctions.sendMessage(plr, C.ALREADY_ADDED);
+                MainUtil.sendMessage(plr, C.ALREADY_ADDED);
                 return false;
             }
-            final Player player = UUIDHandler.uuidWrapper.getPlayer(uuid);
+            final PlotPlayer player = UUIDHandler.getPlayer(uuid);
             if (!uuid.equals(DBFunc.everyone) && (player != null) && player.isOnline()) {
-                final Plot pl = PlayerFunctions.getCurrentPlot(player);
+                final Plot pl = MainUtil.getPlot(loc);
                 if ((pl != null) && pl.id.equals(plot.id)) {
-                    PlayerFunctions.sendMessage(player, C.YOU_BE_DENIED);
+                    MainUtil.sendMessage(player, C.YOU_BE_DENIED);
-                    player.teleport(player.getWorld().getSpawnLocation());
+                    player.teleport(BlockManager.manager.getSpawn(loc.getWorld()));
                 }
             }
-            PlayerFunctions.sendMessage(plr, C.DENIED_ADDED);
+            MainUtil.sendMessage(plr, C.DENIED_ADDED);
             return true;
         } else if (args[0].equalsIgnoreCase("remove")) {
             if (args[1].equalsIgnoreCase("*")) {
                 final UUID uuid = DBFunc.everyone;
                 if (!plot.denied.contains(uuid)) {
-                    PlayerFunctions.sendMessage(plr, C.WAS_NOT_ADDED);
+                    MainUtil.sendMessage(plr, C.WAS_NOT_ADDED);
                     return true;
                 }
                 plot.removeDenied(uuid);
-                DBFunc.removeDenied(plr.getWorld().getName(), plot, uuid);
+                DBFunc.removeDenied(loc.getWorld(), plot, uuid);
-                PlayerFunctions.sendMessage(plr, C.DENIED_REMOVED);
+                MainUtil.sendMessage(plr, C.DENIED_REMOVED);
                 return true;
             }
             final UUID uuid = UUIDHandler.getUUID(args[1]);
             plot.removeDenied(uuid);
-            DBFunc.removeDenied(plr.getWorld().getName(), plot, uuid);
+            DBFunc.removeDenied(loc.getWorld(), plot, uuid);
-            final PlayerPlotDeniedEvent event = new PlayerPlotDeniedEvent(plr, plot, uuid, false);
+            // FIXME PlayerPlotDeniedEvent
-            Bukkit.getPluginManager().callEvent(event);
+            MainUtil.sendMessage(plr, C.DENIED_REMOVED);
-            PlayerFunctions.sendMessage(plr, C.DENIED_REMOVED);
         } else {
-            PlayerFunctions.sendMessage(plr, C.DENIED_NEED_ARGUMENT);
+            MainUtil.sendMessage(plr, C.DENIED_NEED_ARGUMENT);
             return true;
         }
         return true;

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
@@ -26,9 +25,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.flag.AbstractFlag;
@@ -36,17 +33,19 @@ import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
 import com.intellectualcrafters.plot.flag.FlagValue;
 import com.intellectualcrafters.plot.listeners.PlotListener;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
 
 public class FlagCmd extends SubCommand {
-
     public FlagCmd() {
         super(Command.FLAG, "Manage plot flags", "f", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player player, final String... args) {
+    public boolean execute(final PlotPlayer player, final String... args) {
         /*
          *  plot flag set fly true
          *  plot flag remove fly
@@ -55,172 +54,171 @@ public class FlagCmd extends SubCommand {
          *  plot flag list
          */
         if (args.length == 0) {
-            PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
+            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
             return false;
         }
-        Plot plot = PlayerFunctions.getCurrentPlot(player);
+        Location loc = player.getLocation();
+        final Plot plot = MainUtil.getPlot(loc);
         if (plot == null) {
-            PlayerFunctions.sendMessage(player, C.NOT_IN_PLOT);
+            MainUtil.sendMessage(player, C.NOT_IN_PLOT);
             return false;
         }
         if (!plot.hasOwner()) {
             sendMessage(player, C.PLOT_NOT_CLAIMED);
             return false;
         }
-        if (!plot.hasRights(player) && !PlotMain.hasPermission(player, "plots.set.flag.other")) {
+        if (!plot.isAdded(player.getUUID()) && !Permissions.hasPermission(player, "plots.set.flag.other")) {
-            PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.set.flag.other");
+            MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag.other");
             return false;
         }
         switch (args[0].toLowerCase()) {
             case "info": {
-                if (!PlotMain.hasPermission(player, "plots.set.flag")) {
+                if (!Permissions.hasPermission(player, "plots.set.flag")) {
-                    PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.flag.info");
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.info");
                     return false;
                 }
                 if (args.length != 2) {
-                    PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
                     return false;
                 }
-                AbstractFlag af = FlagManager.getFlag(args[1]);
+                final AbstractFlag af = FlagManager.getFlag(args[1]);
                 if (af == null) {
-                    PlayerFunctions.sendMessage(player, C.NOT_VALID_FLAG);
+                    MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
-                    PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
                     return false;
                 }
                 // flag key
-                PlayerFunctions.sendMessage(player, C.FLAG_KEY, af.getKey());
+                MainUtil.sendMessage(player, C.FLAG_KEY, af.getKey());
                 // flag type
-                PlayerFunctions.sendMessage(player, C.FLAG_TYPE, af.value.getClass().getSimpleName());
+                MainUtil.sendMessage(player, C.FLAG_TYPE, af.value.getClass().getSimpleName());
                 // Flag type description
-                PlayerFunctions.sendMessage(player, C.FLAG_DESC, af.getValueDesc());
+                MainUtil.sendMessage(player, C.FLAG_DESC, af.getValueDesc());
-                PlayerFunctions.sendMessage(player, "&cNot implemented.");
+                MainUtil.sendMessage(player, "&cNot implemented.");
             }
             case "set": {
-                if (!PlotMain.hasPermission(player, "plots.set.flag")) {
+                if (!Permissions.hasPermission(player, "plots.set.flag")) {
-                    PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.set.flag");
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag");
                     return false;
                 }
                 if (args.length < 3) {
-                    PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag set <flag> <value>");
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag set <flag> <value>");
                     return false;
                 }
-                AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
+                final AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
                 if (af == null) {
-                    PlayerFunctions.sendMessage(player, C.NOT_VALID_FLAG);
+                    MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
                     return false;
                 }
-                if (!PlotMain.hasPermission(player, "plots.set.flag." + args[1].toLowerCase())) {
+                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase())) {
-                    PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase());
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase());
                     return false;
                 }
-                String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " ");
+                final String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " ");
-                Object parsed = af.parseValueRaw(value);
+                final Object parsed = af.parseValueRaw(value);
                 if (parsed == null) {
-                    PlayerFunctions.sendMessage(player, "&c" + af.getValueDesc());
+                    MainUtil.sendMessage(player, "&c" + af.getValueDesc());
                     return false;
                 }
                 final Flag flag = new Flag(FlagManager.getFlag(args[1].toLowerCase(), true), parsed);
-                boolean result = FlagManager.addPlotFlag(plot, flag);
+                final boolean result = FlagManager.addPlotFlag(plot, flag);
                 if (!result) {
-                    PlayerFunctions.sendMessage(player, C.FLAG_NOT_ADDED);
+                    MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
                     return false;
                 }
-                PlayerFunctions.sendMessage(player, C.FLAG_ADDED);
+                MainUtil.sendMessage(player, C.FLAG_ADDED);
                 PlotListener.plotEntry(player, plot);
                 return true;
             }
             case "remove": {
-                if (!PlotMain.hasPermission(player, "plots.flag.remove")) {
+                if (!Permissions.hasPermission(player, "plots.flag.remove")) {
-                    PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.flag.remove");
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.remove");
                     return false;
                 }
-                if (args.length != 2 && args.length != 3) {
+                if ((args.length != 2) && (args.length != 3)) {
-                    PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag remove <flag> [values]");
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag remove <flag> [values]");
                     return false;
                 }
-                AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
+                final AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
                 if (af == null) {
-                    PlayerFunctions.sendMessage(player, C.NOT_VALID_FLAG);
+                    MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
                     return false;
                 }
-                if (!PlotMain.hasPermission(player, "plots.set.flag." + args[1].toLowerCase())) {
+                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase())) {
-                    PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase());
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase());
                     return false;
                 }
-                Flag flag = FlagManager.getPlotFlagAbs(plot, args[1].toLowerCase());
+                final Flag flag = FlagManager.getPlotFlagAbs(plot, args[1].toLowerCase());
                 if (flag == null) {
-                    PlayerFunctions.sendMessage(player, C.FLAG_NOT_IN_PLOT);
+                    MainUtil.sendMessage(player, C.FLAG_NOT_IN_PLOT);
                     return false;
                 }
-                if (args.length == 3 && flag.getAbstractFlag().isList()) {
+                if ((args.length == 3) && flag.getAbstractFlag().isList()) {
-                    String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " ");
+                    final String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " ");
                     ((FlagValue.ListValue) flag.getAbstractFlag().value).remove(flag.getValue(), value);
                     DBFunc.setFlags(plot.world, plot, plot.settings.flags);
-                }
+                } else {
-                else {
+                    final boolean result = FlagManager.removePlotFlag(plot, flag.getKey());
-                    boolean result = FlagManager.removePlotFlag(plot, flag.getKey());
                     if (!result) {
-                        PlayerFunctions.sendMessage(player, C.FLAG_NOT_REMOVED);
+                        MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
                         return false;
                     }
                 }
-                PlayerFunctions.sendMessage(player, C.FLAG_REMOVED);
+                MainUtil.sendMessage(player, C.FLAG_REMOVED);
                 PlotListener.plotEntry(player, plot);
                 return true;
             }
             case "add": {
-                if (!PlotMain.hasPermission(player, "plots.flag.add")) {
+                if (!Permissions.hasPermission(player, "plots.flag.add")) {
-                    PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.flag.add");
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.add");
                     return false;
                 }
                 if (args.length < 3) {
-                    PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag add <flag> <values>");
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag add <flag> <values>");
                     return false;
                 }
-                AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
+                final AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
                 if (af == null) {
-                    PlayerFunctions.sendMessage(player, C.NOT_VALID_FLAG);
+                    MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
                     return false;
                 }
-                if (!PlotMain.hasPermission(player, "plots.set.flag." + args[1].toLowerCase())) {
+                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase())) {
-                    PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase());
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase());
                     return false;
                 }
-                String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " ");
+                final String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " ");
-                Object parsed = af.parseValueRaw(value);
+                final Object parsed = af.parseValueRaw(value);
                 if (parsed == null) {
-                    PlayerFunctions.sendMessage(player, "&c" + af.getValueDesc());
+                    MainUtil.sendMessage(player, "&c" + af.getValueDesc());
                     return false;
                 }
                 Flag flag = FlagManager.getPlotFlag(plot, args[1].toLowerCase());
-                if (flag == null || !flag.getAbstractFlag().isList()) {
+                if ((flag == null) || !flag.getAbstractFlag().isList()) {
                     flag = new Flag(FlagManager.getFlag(args[1].toLowerCase(), true), parsed);
-                }
+                } else {
-                else {
                     ((FlagValue.ListValue) flag.getAbstractFlag().value).add(flag.getValue(), value);
                 }
-                boolean result = FlagManager.addPlotFlag(plot, flag);
+                final boolean result = FlagManager.addPlotFlag(plot, flag);
                 if (!result) {
-                    PlayerFunctions.sendMessage(player, C.FLAG_NOT_ADDED);
+                    MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
                     return false;
                 }
                 DBFunc.setFlags(plot.world, plot, plot.settings.flags);
-                PlayerFunctions.sendMessage(player, C.FLAG_ADDED);
+                MainUtil.sendMessage(player, C.FLAG_ADDED);
                 PlotListener.plotEntry(player, plot);
                 return true;
             }
             case "list": {
-                if (!PlotMain.hasPermission(player, "plots.flag.list")) {
+                if (!Permissions.hasPermission(player, "plots.flag.list")) {
-                    PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.flag.list");
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.list");
                     return false;
                 }
                 if (args.length != 1) {
-                    PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag list");
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag list");
                     return false;
                 }
-                HashMap<String, ArrayList<String>> flags = new HashMap<>();
+                final HashMap<String, ArrayList<String>> flags = new HashMap<>();
-                for (AbstractFlag af : FlagManager.getFlags()) {
+                for (final AbstractFlag af : FlagManager.getFlags()) {
-                    String type = af.value.getClass().getSimpleName().replaceAll("Value", "");
+                    final String type = af.value.getClass().getSimpleName().replaceAll("Value", "");
                     if (!flags.containsKey(type)) {
                         flags.put(type, new ArrayList<String>());
                     }
@@ -228,15 +226,15 @@ public class FlagCmd extends SubCommand {
                 }
                 String message = "";
                 String prefix = "";
-                for (String flag : flags.keySet()) {
+                for (final String flag : flags.keySet()) {
-                    message += prefix + "&6" + flag +": &7" + StringUtils.join(flags.get(flag), ", ");
+                    message += prefix + "&6" + flag + ": &7" + StringUtils.join(flags.get(flag), ", ");
                     prefix = "\n";
                 }
-                PlayerFunctions.sendMessage(player, message);
+                MainUtil.sendMessage(player, message);
                 return true;
             }
         }
-        PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
+        MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
         return false;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Help.java

@@ -5,10 +5,9 @@
  *
  * >> File = Help.java >> Generated by: Citymonstret at 2014-08-11 17:32
  */
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 
 public class Help extends SubCommand {
     public Help() {
@@ -16,7 +15,7 @@ public class Help extends SubCommand {
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         return false;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java

@@ -18,45 +18,41 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.events.PlayerPlotHelperEvent;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class Helpers extends SubCommand {
-
     public Helpers() {
         super(Command.HELPERS, "Manage plot helpers", "helpers {add|remove} {player}", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 2) {
-            PlayerFunctions.sendMessage(plr, C.HELPER_NEED_ARGUMENT);
+            MainUtil.sendMessage(plr, C.HELPER_NEED_ARGUMENT);
             return true;
         }
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
-            return true;
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
         if ((plot == null) || !plot.hasOwner()) {
-            PlayerFunctions.sendMessage(plr, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !PlotMain.hasPermission(plr, "plots.admin.command.helpers")) {
+        if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !Permissions.hasPermission(plr, "plots.admin.command.helpers")) {
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
+            MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         if (args[0].equalsIgnoreCase("add")) {
@@ -67,52 +63,50 @@ public class Helpers extends SubCommand {
                 uuid = UUIDHandler.getUUID(args[1]);
             }
             if (uuid == null) {
-                PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER, args[1]);
+                MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]);
                 return false;
             }
             if (!plot.helpers.contains(uuid)) {
                 if (plot.owner.equals(uuid)) {
-                    PlayerFunctions.sendMessage(plr, C.ALREADY_OWNER);
+                    MainUtil.sendMessage(plr, C.ALREADY_OWNER);
                     return false;
                 }
                 if (plot.trusted.contains(uuid)) {
                     plot.trusted.remove(uuid);
-                    DBFunc.removeTrusted(plr.getWorld().getName(), plot, uuid);
+                    DBFunc.removeTrusted(loc.getWorld(), plot, uuid);
                 }
                 if (plot.denied.contains(uuid)) {
                     plot.denied.remove(uuid);
-                    DBFunc.removeDenied(plr.getWorld().getName(), plot, uuid);
+                    DBFunc.removeDenied(loc.getWorld(), plot, uuid);
                 }
                 plot.addHelper(uuid);
-                DBFunc.setHelper(plr.getWorld().getName(), plot, uuid);
+                DBFunc.setHelper(loc.getWorld(), plot, uuid);
-                final PlayerPlotHelperEvent event = new PlayerPlotHelperEvent(plr, plot, uuid, true);
+                // FIXME PlayerPlotHelperEvent
-                Bukkit.getPluginManager().callEvent(event);
             } else {
-                PlayerFunctions.sendMessage(plr, C.ALREADY_ADDED);
+                MainUtil.sendMessage(plr, C.ALREADY_ADDED);
                 return false;
             }
-            PlayerFunctions.sendMessage(plr, C.HELPER_ADDED);
+            MainUtil.sendMessage(plr, C.HELPER_ADDED);
             return true;
         } else if (args[0].equalsIgnoreCase("remove")) {
             if (args[1].equalsIgnoreCase("*")) {
                 final UUID uuid = DBFunc.everyone;
                 if (!plot.helpers.contains(uuid)) {
-                    PlayerFunctions.sendMessage(plr, C.WAS_NOT_ADDED);
+                    MainUtil.sendMessage(plr, C.WAS_NOT_ADDED);
                     return true;
                 }
                 plot.removeHelper(uuid);
-                DBFunc.removeHelper(plr.getWorld().getName(), plot, uuid);
+                DBFunc.removeHelper(loc.getWorld(), plot, uuid);
-                PlayerFunctions.sendMessage(plr, C.HELPER_REMOVED);
+                MainUtil.sendMessage(plr, C.HELPER_REMOVED);
                 return true;
             }
             final UUID uuid = UUIDHandler.getUUID(args[1]);
             plot.removeHelper(uuid);
-            DBFunc.removeHelper(plr.getWorld().getName(), plot, uuid);
+            DBFunc.removeHelper(loc.getWorld(), plot, uuid);
-            final PlayerPlotHelperEvent event = new PlayerPlotHelperEvent(plr, plot, uuid, false);
+            // FIXME PlayerPlotHelperEvent
-            Bukkit.getPluginManager().callEvent(event);
+            MainUtil.sendMessage(plr, C.HELPER_REMOVED);
-            PlayerFunctions.sendMessage(plr, C.HELPER_REMOVED);
         } else {
-            PlayerFunctions.sendMessage(plr, C.HELPER_NEED_ARGUMENT);
+            MainUtil.sendMessage(plr, C.HELPER_NEED_ARGUMENT);
             return true;
         }
         return true;

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java

@@ -18,28 +18,25 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * @author Citymonstret
  */
 public class Home extends SubCommand {
-
     public Home() {
         super(Command.HOME, "Go to your plot", "home {id|alias}", CommandCategory.TELEPORT, true);
     }
     
     private Plot isAlias(final String a) {
-        for (final Plot p : PlotMain.getPlots()) {
+        for (final Plot p : PlotSquared.getPlots()) {
             if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) {
                 return p;
             }
@@ -48,14 +45,14 @@ public class Home extends SubCommand {
     }
     
     @Override
-    public boolean execute(final Player plr, String... args) {
+    public boolean execute(final PlotPlayer plr, String... args) {
-        final Plot[] plots = PlotMain.getPlots(plr).toArray(new Plot[0]);
+        final Plot[] plots = PlotSquared.getPlots(plr).toArray(new Plot[0]);
         if (plots.length == 1) {
-            PlotMain.teleportPlayer(plr, plr.getLocation(), plots[0]);
+            MainUtil.teleportPlayer(plr, plr.getLocation(), plots[0]);
             return true;
         } else if (plots.length > 1) {
             if (args.length < 1) {
-                args = new String[]{"1"};
+                args = new String[] { "1" };
             }
             int id = 0;
             try {
@@ -65,30 +62,29 @@ public class Home extends SubCommand {
                 if ((temp = isAlias(args[0])) != null) {
                     if (temp.hasOwner()) {
                         if (temp.getOwner().equals(UUIDHandler.getUUID(plr))) {
-                            teleportPlayer(plr, temp);
+                            MainUtil.teleportPlayer(plr, plr.getLocation(), temp);
                             return true;
                         }
                     }
-                    PlayerFunctions.sendMessage(plr, C.NOT_YOUR_PLOT);
+                    MainUtil.sendMessage(plr, C.NOT_YOUR_PLOT);
                     return false;
                 }
-                PlayerFunctions.sendMessage(plr, C.NOT_VALID_NUMBER);
+                MainUtil.sendMessage(plr, C.NOT_VALID_NUMBER);
                 return true;
             }
             if ((id > (plots.length)) || (id < 1)) {
-                PlayerFunctions.sendMessage(plr, C.NOT_VALID_NUMBER);
+                MainUtil.sendMessage(plr, C.NOT_VALID_NUMBER);
                 return false;
             }
-            teleportPlayer(plr, plots[id - 1]);
+            MainUtil.teleportPlayer(plr, plr.getLocation(), plots[id - 1]);
             return true;
         } else {
-            PlayerFunctions.sendMessage(plr, C.NO_PLOTS);
+            MainUtil.sendMessage(plr, C.NO_PLOTS);
             return true;
         }
     }
     
-    public void teleportPlayer(Player player, Plot plot) {
+    public void teleportPlayer(final PlotPlayer player, final Plot plot) {
-    	PlotMain.teleportPlayer(player, player.getLocation(), plot);
+        MainUtil.teleportPlayer(player, player.getLocation(), plot);
     }
-    
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
@@ -26,50 +25,48 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotComment;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class Inbox extends SubCommand {
-
     public Inbox() {
         super(Command.INBOX, "Review the comments for a plot", "inbox", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         boolean report = false;
-    	if (args.length == 1){
+        if (args.length == 1) {
             if (args[0].equalsIgnoreCase("reports")) {
                 report = true;
             }
         }
-        if (!PlayerFunctions.isInPlot(plr) && !report) {
+        Location loc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null && !report) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
+        }
+        if ((plot != null) && !plot.hasOwner()) {
+            MainUtil.sendMessage(plr, C.NOT_IN_PLOT);
             return false;
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if (plot != null && !plot.hasOwner()) {
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
-            return false;
-        }
-
         Integer tier;
         final UUID uuid = UUIDHandler.getUUID(plr);
-        if (PlotMain.hasPermission(plr, "plots.comment.admin")) {
+        if (Permissions.hasPermission(plr, "plots.comment.admin")) {
             tier = 0;
-        } else if (plot != null && plot.owner.equals(uuid)) {
+        } else if ((plot != null) && plot.owner.equals(uuid)) {
             tier = 1;
-        } else if (plot != null && plot.helpers.contains(uuid)) {
+        } else if ((plot != null) && plot.helpers.contains(uuid)) {
             tier = 2;
-        } else if (plot != null && plot.trusted.contains(uuid)) {
+        } else if ((plot != null) && plot.trusted.contains(uuid)) {
             tier = 3;
         } else {
             tier = 4;
@@ -82,7 +79,7 @@ public class Inbox extends SubCommand {
                     if (tier <= 0) {
                         tier = 0;
                     } else {
-                    	PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.admin");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.admin");
                         return false;
                     }
                     break;
@@ -90,7 +87,7 @@ public class Inbox extends SubCommand {
                     if (tier <= 1) {
                         tier = 1;
                     } else {
-                    	PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.owner");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.owner");
                         return false;
                     }
                     break;
@@ -98,7 +95,7 @@ public class Inbox extends SubCommand {
                     if (tier <= 2) {
                         tier = 2;
                     } else {
-                    	PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.helper");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.helper");
                         return false;
                     }
                     break;
@@ -106,7 +103,7 @@ public class Inbox extends SubCommand {
                     if (tier <= 3) {
                         tier = 3;
                     } else {
-                    	PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.trusted");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.trusted");
                         return false;
                     }
                     break;
@@ -114,7 +111,7 @@ public class Inbox extends SubCommand {
                     if (tier <= 4) {
                         tier = 4;
                     } else {
-                    	PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.everyone");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.everyone");
                         return false;
                     }
                     break;
@@ -122,41 +119,36 @@ public class Inbox extends SubCommand {
                     if (tier <= 0) {
                         tier = -1;
                     } else {
-                    	PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.admin");
+                        MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.inbox.admin");
                         return false;
                     }
                     break;
                 default:
-                    PlayerFunctions.sendMessage(plr, C.INVALID_INBOX, Arrays.copyOfRange(new String[]{"admin", "owner", "helper", "trusted", "everyone"}, Math.max(0, tier), 4));
+                    MainUtil.sendMessage(plr, C.INVALID_INBOX, Arrays.copyOfRange(new String[] { "admin", "owner", "helper", "trusted", "everyone" }, Math.max(0, tier), 4));
                     return false;
             }
-        }
+        } else {
-        else {
             below = true;
         }
-
+        final String world = loc.getWorld();
-        final String world = plr.getWorld().getName();
         final int tier2 = tier;
-
+        TaskManager.runTaskAsync(new Runnable() {
-        Bukkit.getScheduler().runTaskAsynchronously(PlotMain.getMain(), new Runnable() {
             @Override
             public void run() {
                 ArrayList<PlotComment> comments = null;
                 if (tier2 == -1) {
                     comments = DBFunc.getComments(world, null, 0, false);
-            	}
+                } else {
-            	else {
                     comments = plot.settings.getComments(tier2);
                 }
                 if (comments == null) {
                     comments = DBFunc.getComments(world, plot, tier2, below);
                     plot.settings.setComments(comments);
                 }
-
                 if (args.length == 2) {
                     final String[] split = args[1].toLowerCase().split(":");
                     if (!split[0].equals("clear")) {
-                        PlayerFunctions.sendMessage(plr, "&c/plot inbox [tier] [clear][:#]");
+                        MainUtil.sendMessage(plr, "&c/plot inbox [tier] [clear][:#]");
                         return;
                     }
                     if (split.length > 1) {
@@ -165,10 +157,10 @@ public class Inbox extends SubCommand {
                             final PlotComment comment = comments.get(index - 1);
                             DBFunc.removeComment(world, plot, comment);
                             plot.settings.removeComment(comment);
-                            PlayerFunctions.sendMessage(plr, C.COMMENT_REMOVED, "1 comment");
+                            MainUtil.sendMessage(plr, C.COMMENT_REMOVED, "1 comment");
                             return;
                         } catch (final Exception e) {
-                            PlayerFunctions.sendMessage(plr, "&cInvalid index:\n/plot inbox [tier] [clear][:#]");
+                            MainUtil.sendMessage(plr, "&cInvalid index:\n/plot inbox [tier] [clear][:#]");
                             return;
                         }
                     }
@@ -176,7 +168,7 @@ public class Inbox extends SubCommand {
                         DBFunc.removeComment(world, plot, comment);
                     }
                     plot.settings.removeComments(comments);
-                    PlayerFunctions.sendMessage(plr, C.COMMENT_REMOVED, "all comments in that category");
+                    MainUtil.sendMessage(plr, C.COMMENT_REMOVED, "all comments in that category");
                 } else {
                     final List<String> recipients = Arrays.asList("A", "O", "H", "T", "E");
                     int count = 1;
@@ -190,7 +182,7 @@ public class Inbox extends SubCommand {
                     if (comments.size() == 0) {
                         message.append("&cNo messages.");
                     }
-                    PlayerFunctions.sendMessage(plr, message.toString());
+                    MainUtil.sendMessage(plr, message.toString());
                 }
             }
         });

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java

@@ -18,106 +18,97 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 import java.util.UUID;
 
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.flag.FlagManager;
 import com.intellectualcrafters.plot.object.InfoInventory;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.BlockManager;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * @author Citymonstret
  */
-@SuppressWarnings({"javadoc"}) public class Info extends SubCommand {
+@SuppressWarnings({ "javadoc" })
-
+public class Info extends SubCommand {
     public Info() {
         super(Command.INFO, "Display plot info", "info", CommandCategory.INFO, false);
     }
     
     @Override
-    public boolean execute(final Player player, String... args) {
+    public boolean execute(final PlotPlayer player, String... args) {
-        World world;
         Plot plot;
+        String world;
         if (player != null) {
-            world = player.getWorld();
+            Location loc = player.getLocation();
-            if (!PlotMain.isPlotWorld(world)) {
+            world = loc.getWorld();
-                PlayerFunctions.sendMessage(player, C.NOT_IN_PLOT_WORLD);
+            if (!PlotSquared.isPlotWorld(world)) {
+                MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD);
                 return false;
             }
-            if (!PlayerFunctions.isInPlot(player)) {
+            plot = MainUtil.getPlot(loc);
-                PlayerFunctions.sendMessage(player, C.NOT_IN_PLOT);
+            if (plot == null) {
-                return false;
+                return !sendMessage(player, C.NOT_IN_PLOT);
             }
-            plot = PlayerFunctions.getCurrentPlot(player);
         } else {
             if (args.length < 2) {
-                PlayerFunctions.sendMessage(null, C.INFO_SYNTAX_CONSOLE);
+                MainUtil.sendMessage(null, C.INFO_SYNTAX_CONSOLE);
                 return false;
             }
-            final PlotWorld plotworld = PlotMain.getWorldSettings(args[0]);
+            final PlotWorld plotworld = PlotSquared.getPlotWorld(args[0]);
             if (plotworld == null) {
-                PlayerFunctions.sendMessage(player, C.NOT_VALID_WORLD);
+                MainUtil.sendMessage(player, C.NOT_VALID_WORLD);
                 return false;
             }
             try {
                 final String[] split = args[1].split(";");
                 final PlotId id = new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-                plot = PlotHelper.getPlot(Bukkit.getWorld(plotworld.worldname), id);
+                plot = MainUtil.getPlot(plotworld.worldname, id);
                 if (plot == null) {
-                    PlayerFunctions.sendMessage(player, C.NOT_VALID_PLOT_ID);
+                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
                     return false;
                 }
-                world = Bukkit.getWorld(args[0]);
+                world = args[0];
                 if (args.length == 3) {
-                    args = new String[]{args[2]};
+                    args = new String[] { args[2] };
                 } else {
                     args = new String[0];
                 }
             } catch (final Exception e) {
-                PlayerFunctions.sendMessage(player, C.INFO_SYNTAX_CONSOLE);
+                MainUtil.sendMessage(player, C.INFO_SYNTAX_CONSOLE);
                 return false;
             }
         }
-
         if ((args.length == 1) && args[0].equalsIgnoreCase("inv")) {
             new InfoInventory(plot, player).build().display();
             return true;
         }
-
         final boolean hasOwner = plot.hasOwner();
         boolean containsEveryone;
         boolean trustedEveryone;
-
         // Wildcard player {added}
         {
             containsEveryone = (plot.helpers != null) && plot.helpers.contains(DBFunc.everyone);
             trustedEveryone = (plot.trusted != null) && plot.trusted.contains(DBFunc.everyone);
         }
-
         // Unclaimed?
         if (!hasOwner && !containsEveryone && !trustedEveryone) {
-            PlayerFunctions.sendMessage(player, C.PLOT_INFO_UNCLAIMED, (plot.id.x + ";" + plot.id.y));
+            MainUtil.sendMessage(player, C.PLOT_INFO_UNCLAIMED, (plot.id.x + ";" + plot.id.y));
             return true;
         }
-
         String owner = "none";
         if (plot.owner != null) {
             owner = UUIDHandler.getName(plot.owner);
@@ -126,18 +117,16 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
             owner = plot.owner.toString();
         }
         String info = C.PLOT_INFO.s();
-
         if (args.length == 1) {
             info = getCaption(args[0].toLowerCase());
             if (info == null) {
-                PlayerFunctions.sendMessage(player, "&6Categories&7: &ahelpers&7, &aalias&7, &abiome&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, &aowner&7, &arating");
+                MainUtil.sendMessage(player, "&6Categories&7: &ahelpers&7, &aalias&7, &abiome&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, &aowner&7, &arating");
                 return false;
             }
         }
-
         info = format(info, world, plot, player);
-        PlayerFunctions.sendMessage(player, C.PLOT_INFO_HEADER);
+        MainUtil.sendMessage(player, C.PLOT_INFO_HEADER);
-        PlayerFunctions.sendMessage(player, info, false);
+        MainUtil.sendMessage(player, info, false);
         return true;
     }
     
@@ -168,20 +157,18 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
         }
     }
     
-    private String format(String info, final World world, final Plot plot, final Player player) {
+    private String format(String info, final String world, final Plot plot, final PlotPlayer player) {
-
         final PlotId id = plot.id;
-        final PlotId id2 = PlayerFunctions.getTopPlot(world, plot).id;
+        final PlotId id2 = MainUtil.getTopPlot(plot).id;
-        final int num = PlayerFunctions.getPlotSelectionIds(id, id2).size();
+        final int num = MainUtil.getPlotSelectionIds(id, id2).size();
         final String alias = plot.settings.getAlias().length() > 0 ? plot.settings.getAlias() : "none";
-        final String biome = getBiomeAt(plot).toString();
+        final String biome = BlockManager.manager.getBiome(MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1));
         final String helpers = getPlayerList(plot.helpers);
         final String trusted = getPlayerList(plot.trusted);
         final String denied = getPlayerList(plot.denied);
         final String rating = String.format("%.1f", DBFunc.getRatings(plot));
         final String flags = "&6" + (StringUtils.join(FlagManager.getPlotFlags(plot), "").length() > 0 ? StringUtils.join(FlagManager.getPlotFlags(plot), "&7, &6") : "none");
-        final boolean build = (player == null) || plot.hasRights(player);
+        final boolean build = (player == null) || plot.isAdded(player.getUUID());
-
         String owner = "none";
         if (plot.owner != null) {
             owner = UUIDHandler.getName(plot.owner);
@@ -189,7 +176,6 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
         if (owner == null) {
             owner = plot.owner.toString();
         }
-
         info = info.replaceAll("%alias%", alias);
         info = info.replaceAll("%id%", id.toString());
         info = info.replaceAll("%id2%", id2.toString());
@@ -203,7 +189,6 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
         info = info.replaceAll("%flags%", flags);
         info = info.replaceAll("%build%", build + "");
         info = info.replaceAll("%desc%", "No description set.");
-
         return info;
     }
     
@@ -230,16 +215,10 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
         if (uuid.equals(DBFunc.everyone) || uuid.toString().equalsIgnoreCase(DBFunc.everyone.toString())) {
             return "everyone";
         }
-        String name = UUIDHandler.getName(uuid);
+        final String name = UUIDHandler.getName(uuid);
         if (name == null) {
             return "unknown";
         }
         return name;
     }
-
-    private Biome getBiomeAt(final Plot plot) {
-        final World w = Bukkit.getWorld(plot.world);
-        final Location bl = PlotHelper.getPlotTopLoc(w, plot.id);
-        return bl.getBlock().getBiome();
-    }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
@@ -26,18 +25,19 @@ import java.util.ArrayList;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-public class Inventory extends SubCommand {
+import com.intellectualcrafters.plot.object.BukkitPlayer;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 
+public class Inventory extends SubCommand {
     public Inventory() {
         super("inventory", "plots.inventory", "Open a command inventory", "inventory", "inv", CommandCategory.INFO, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         final ArrayList<SubCommand> cmds = new ArrayList<>();
         for (final SubCommand cmd : MainCommand.subCommands) {
             if (cmd.permission.hasPermission(plr)) {
@@ -49,7 +49,8 @@ public class Inventory extends SubCommand {
         for (final SubCommand cmd : cmds) {
             inventory.addItem(getItem(cmd));
         }
-        plr.openInventory(inventory);
+        // FIXME unchecked cast
+        ((BukkitPlayer) plr).player.openInventory(inventory);
         return true;
     }
     

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java

@@ -18,49 +18,48 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.BlockManager;
-
+import com.intellectualcrafters.plot.util.MainUtil;
-@SuppressWarnings({"unused", "deprecation", "javadoc"}) public class Kick extends SubCommand {
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
+@SuppressWarnings({ "unused", "deprecation", "javadoc" })
+public class Kick extends SubCommand {
     public Kick() {
         super(Command.KICK, "Kick a player from your plot", "kick", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, "You're not in a plot.");
+        final Plot plot = MainUtil.getPlot(loc);
-            return false;
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
+        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.kick")) {
-        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !PlotMain.hasPermission(plr, "plots.admin.command.kick")) {
+            MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
         if (args.length != 1) {
-            PlayerFunctions.sendMessage(plr, "&c/plot kick <player>");
+            MainUtil.sendMessage(plr, "&c/plot kick <player>");
             return false;
         }
-        if (Bukkit.getPlayer(args[0]) == null) {
+        PlotPlayer player = UUIDHandler.getPlayer(args[0]);
-            PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER, args[0]);
+        if (player == null) {
+            MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
-        final Player player = Bukkit.getPlayer(args[0]);
+        if (!player.getLocation().getWorld().equals(loc.getWorld()) || !plot.equals(MainUtil.getPlot(loc))) {
-        if (!player.getWorld().equals(plr.getWorld()) || !PlayerFunctions.isInPlot(player) || (PlayerFunctions.getCurrentPlot(player) == null) || !PlayerFunctions.getCurrentPlot(player).equals(plot)) {
+            MainUtil.sendMessage(plr, C.INVALID_PLAYER.s().replaceAll("%player%", args[0]));
-            PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER.s().replaceAll("%player%", args[0]));
             return false;
         }
-        player.teleport(player.getWorld().getSpawnLocation());
+        player.teleport(BlockManager.manager.getSpawn(loc.getWorld()));
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java

@@ -18,54 +18,44 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.bukkit.ChatColor;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.StringComparison;
 
 /**
- * PlotMain command class
+ * PlotSquared command class
  *
  * @author Citymonstret
  */
-public class MainCommand implements CommandExecutor, TabCompleter {
+public class MainCommand {
-
     /**
      * Main Permission Node
      */
-    public static final String MAIN_PERMISSION = "plots.use";
+    private final static SubCommand[] _subCommands = new SubCommand[] { new Setup(), new DebugSaveTest(), new DebugLoadTest(), new CreateRoadSchematic(), new RegenAllRoads(), new DebugClear(), new Claim(), new Auto(), new Home(), new Visit(), new TP(), new Set(), new Clear(), new Delete(), new SetOwner(), new Denied(), new Helpers(), new Trusted(), new Info(), new list(), new Help(), new Debug(), new Schematic(), new plugin(), new Inventory(), new Purge(), new Reload(), new Merge(), new Unlink(), new Kick(), new Rate(), new DebugClaimTest(), new Inbox(), new Comment(), new Database(), new Unclaim(), new Swap(), new MusicSubcommand(), new DebugRoadRegen(), new Trim(), new DebugExec(), new FlagCmd(), new Target(), new DebugFixFlags(), new Move(), new Condense() };
-
-    private final static SubCommand[] _subCommands = new SubCommand[]{new Setup(), new DebugSaveTest(), new DebugLoadTest(), new CreateRoadSchematic(), new RegenAllRoads(), new DebugClear(), new Ban(), new Unban(), new OP(), new DEOP(), new Claim(), new Paste(), new Copy(), new Clipboard(), new Auto(), new Home(), new Visit(), new TP(), new Set(), new Clear(), new Delete(), new SetOwner(), new Denied(), new Helpers(), new Trusted(), new Info(), new list(), new Help(), new Debug(), new Schematic(), new plugin(), new Inventory(), new Purge(), new Reload(), new Merge(), new Unlink(), new Kick(), new Rate(), new DebugClaimTest(), new Inbox(), new Comment(), new Database(), new Unclaim(), new Swap(), new MusicSubcommand(), new DebugRoadRegen(), new Trim(), new DebugExec(), new FlagCmd(), new Target(), new DebugFixFlags(), new Move(), new Condense() };
-
     public final static ArrayList<SubCommand> subCommands = new ArrayList<SubCommand>() {
         {
             addAll(Arrays.asList(_subCommands));
         }
     };
 
-    public static boolean no_permission(final Player player, final String permission) {
+    public static boolean no_permission(final PlotPlayer player, final String permission) {
-        PlayerFunctions.sendMessage(player, C.NO_PERMISSION, permission);
+        MainUtil.sendMessage(player, C.NO_PERMISSION, permission);
         return false;
     }
 
-    public static List<SubCommand> getCommands(final SubCommand.CommandCategory category, final Player player) {
+    public static List<SubCommand> getCommands(final SubCommand.CommandCategory category, final PlotPlayer player) {
         final List<SubCommand> cmds = new ArrayList<>();
         for (final SubCommand c : subCommands) {
-        	if (!c.isPlayer || player != null) {
+            if (!c.isPlayer || (player != null)) {
                 if ((c.category.equals(category)) && c.permission.hasPermission(player)) {
                     cmds.add(c);
                 }
@@ -74,7 +64,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
         return cmds;
     }
 
-    public static List<String> helpMenu(final Player player, final SubCommand.CommandCategory category, int page) {
+    public static List<String> helpMenu(final PlotPlayer player, final SubCommand.CommandCategory category, int page) {
         List<SubCommand> commands;
         if (category != null) {
             commands = getCommands(category, player);
@@ -92,15 +82,11 @@ public class MainCommand implements CommandExecutor, TabCompleter {
         if (max > commands.size()) {
             max = commands.size();
         }
-
         final List<String> help = new ArrayList<>();
-
         help.add(C.HELP_HEADER.s());
         // HELP_CATEGORY("&cCategory: &6%category%&c, Page: %current%&c/&6%max%&c, Displaying: &6%dis%&c/&6%total%"),
         help.add(C.HELP_CATEGORY.s().replace("%category%", category == null ? "All" : category.toString()).replace("%current%", "" + (page + 1)).replace("%max%", "" + (totalPages + 1)).replace("%dis%", "" + (commands.size() % perPage)).replace("%total%", "" + commands.size()));
-
         SubCommand cmd;
-
         final int start = page * perPage;
         for (int x = start; x < max; x++) {
             cmd = commands.get(x);
@@ -115,17 +101,13 @@ public class MainCommand implements CommandExecutor, TabCompleter {
     }
     
     private static String t(final String s) {
-        return ChatColor.translateAlternateColorCodes('&', s);
+        return MainUtil.colorise('&', s);
     }
 
-    @Override
+    public static boolean onCommand(final PlotPlayer player, final String cmd, final String... args) {
-    public boolean onCommand(final CommandSender sender, final Command cmd, final String commandLabel, final String[] args) {
+        if (!Permissions.hasPermission(player, PlotSquared.MAIN_PERMISSION)) {
-        final Player player = (sender instanceof Player) ? (Player) sender : null;
+            return no_permission(player, PlotSquared.MAIN_PERMISSION);
-
-        if (!PlotMain.hasPermission(player, MAIN_PERMISSION)) {
-            return no_permission(player, MAIN_PERMISSION);
         }
-
         if ((args.length < 1) || ((args.length >= 1) && (args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("he")))) {
             if (args.length < 2) {
                 final StringBuilder builder = new StringBuilder();
@@ -134,7 +116,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
                     builder.append("\n").append(C.HELP_INFO_ITEM.s().replaceAll("%category%", category.toString().toLowerCase()).replaceAll("%category_desc%", category.toString()));
                 }
                 builder.append("\n").append(C.HELP_INFO_ITEM.s().replaceAll("%category%", "all").replaceAll("%category_desc%", "Display all commands"));
-                return PlayerFunctions.sendMessage(player, builder.toString());
+                return MainUtil.sendMessage(player, builder.toString());
             }
             final String cat = args[1];
             SubCommand.CommandCategory cato = null;
@@ -144,26 +126,23 @@ public class MainCommand implements CommandExecutor, TabCompleter {
                     break;
                 }
             }
-            if (cato == null && !cat.equalsIgnoreCase("all")) {
+            if ((cato == null) && !cat.equalsIgnoreCase("all")) {
                 final StringBuilder builder = new StringBuilder();
                 builder.append(C.HELP_INFO.s());
                 for (final SubCommand.CommandCategory category : SubCommand.CommandCategory.values()) {
                     builder.append("\n").append(C.HELP_INFO_ITEM.s().replaceAll("%category%", category.toString().toLowerCase()).replaceAll("%category_desc%", category.toString()));
                 }
-                return PlayerFunctions.sendMessage(player, builder.toString(), false);
+                return MainUtil.sendMessage(player, builder.toString(), false);
             }
             final StringBuilder help = new StringBuilder();
             int page = 0;
-
             boolean digit = true;
-
             String arg2;
             if (args.length > 2) {
                 arg2 = args[2];
             } else {
                 arg2 = "1";
             }
-
             for (final char c : arg2.toCharArray()) {
                 if (!Character.isDigit(c)) {
                     digit = false;
@@ -176,11 +155,10 @@ public class MainCommand implements CommandExecutor, TabCompleter {
                     page = 0;
                 }
             }
-
             for (final String string : helpMenu(player, cato, page)) {
                 help.append(string).append("\n");
             }
-            sender.sendMessage(ChatColor.translateAlternateColorCodes('&', help.toString()));
+            player.sendMessage(MainUtil.colorise('&', help.toString()));
             // return PlayerFunctions.sendMessage(player, help.toString());
         } else {
             for (final SubCommand command : subCommands) {
@@ -191,61 +169,24 @@ public class MainCommand implements CommandExecutor, TabCompleter {
                         if ((player != null) || !command.isPlayer) {
                             return command.execute(player, arguments);
                         } else {
-                            return !PlayerFunctions.sendMessage(null, C.IS_CONSOLE);
+                            return !MainUtil.sendMessage(null, C.IS_CONSOLE);
                         }
                     } else {
                         return no_permission(player, command.permission.permission.toLowerCase());
                     }
                 }
             }
-            PlayerFunctions.sendMessage(player, C.NOT_VALID_SUBCOMMAND);
+            MainUtil.sendMessage(player, C.NOT_VALID_SUBCOMMAND);
-
             final String[] commands = new String[subCommands.size()];
             for (int x = 0; x < subCommands.size(); x++) {
                 commands[x] = subCommands.get(x).cmd;
             }
-
             /* Let's try to get a proper usage string */
             final String command = new StringComparison(args[0], commands).getBestMatch();
-            return PlayerFunctions.sendMessage(player, C.DID_YOU_MEAN, "/plot " + command);
+            return MainUtil.sendMessage(player, C.DID_YOU_MEAN, "/plot " + command);
             // PlayerFunctions.sendMessage(player, C.DID_YOU_MEAN, new
             // StringComparsion(args[0], commands).getBestMatch());
         }
         return true;
     }
-
-    @Override
-    public List<String> onTabComplete(final CommandSender commandSender, final Command command, final String s, final String[] strings) {
-        if (!(commandSender instanceof Player)) {
-            return null;
-        }
-        final Player player = (Player) commandSender;
-
-        if (strings.length < 1) {
-            if ((strings.length == 0) || "plots".startsWith(s)) {
-                return Arrays.asList("plots");
-            }
-        }
-        if (strings.length > 1) {
-            return null;
-        }
-        if (!command.getLabel().equalsIgnoreCase("plots")) {
-            return null;
-        }
-        final List<String> tabOptions = new ArrayList<>();
-        final String arg = strings[0].toLowerCase();
-        for (final SubCommand cmd : subCommands) {
-            if (cmd.permission.hasPermission(player)) {
-                if (cmd.cmd.startsWith(arg)) {
-                    tabOptions.add(cmd.cmd);
-                } else if (cmd.alias.get(0).startsWith(arg)) {
-                    tabOptions.add(cmd.alias.get(0));
-                }
-            }
-        }
-        if (tabOptions.size() > 0) {
-            return tabOptions;
-        }
-        return null;
-    }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
@@ -26,27 +25,25 @@ import java.util.ArrayList;
 import net.milkbowl.vault.economy.Economy;
 
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.events.PlotMergeEvent;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.EconHandler;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * @author Citymonstret
  */
 public class Merge extends SubCommand {
-
+    public final static String[] values = new String[] { "north", "east", "south", "west" };
-    public final static String[] values = new String[]{"north", "east", "south", "west"};
+    public final static String[] aliases = new String[] { "n", "e", "s", "w" };
-    public final static String[] aliases = new String[]{"n", "e", "s", "w"};
     
     public Merge() {
         super(Command.MERGE, "Merge the plot you are standing on with another plot.", "merge", CommandCategory.ACTIONS, true);
@@ -75,24 +72,24 @@ public class Merge extends SubCommand {
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
-            return true;
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
         if ((plot == null) || !plot.hasOwner()) {
-            PlayerFunctions.sendMessage(plr, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        boolean admin = PlotMain.hasPermission(plr, "plots.admin.command.merge");
+        final boolean admin = Permissions.hasPermission(plr, "plots.admin.command.merge");
         if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !admin) {
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
+            MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
         if (args.length < 1) {
-            PlayerFunctions.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringUtils.join(values, C.BLOCK_LIST_SEPARATER.s()));
+            MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringUtils.join(values, C.BLOCK_LIST_SEPARATER.s()));
-            PlayerFunctions.sendMessage(plr, C.DIRECTION.s().replaceAll("%dir%", direction(plr.getLocation().getYaw())));
+            MainUtil.sendMessage(plr, C.DIRECTION.s().replaceAll("%dir%", direction(plr.getLocation().getYaw())));
             return false;
         }
         int direction = -1;
@@ -103,81 +100,71 @@ public class Merge extends SubCommand {
             }
         }
         if (direction == -1) {
-            PlayerFunctions.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringUtils.join(values, C.BLOCK_LIST_SEPARATER.s()));
+            MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringUtils.join(values, C.BLOCK_LIST_SEPARATER.s()));
-            PlayerFunctions.sendMessage(plr, C.DIRECTION.s().replaceAll("%dir%", direction(plr.getLocation().getYaw())));
+            MainUtil.sendMessage(plr, C.DIRECTION.s().replaceAll("%dir%", direction(plr.getLocation().getYaw())));
             return false;
         }
-        final World world = plr.getWorld();
+        PlotId bot = MainUtil.getBottomPlot(plot).id;
-        PlotId bot = PlayerFunctions.getBottomPlot(world, plot).id;
+        PlotId top = MainUtil.getTopPlot(plot).id;
-        PlotId top = PlayerFunctions.getTopPlot(world, plot).id;
         ArrayList<PlotId> plots;
+        String world = plr.getLocation().getWorld();
         switch (direction) {
             case 0: // north = -y
-                plots = PlayerFunctions.getMaxPlotSelectionIds(world, new PlotId(bot.x, bot.y - 1), new PlotId(top.x, top.y));
+                plots = MainUtil.getMaxPlotSelectionIds(world, new PlotId(bot.x, bot.y - 1), new PlotId(top.x, top.y));
                 break;
             case 1: // east = +x
-                plots = PlayerFunctions.getMaxPlotSelectionIds(world, new PlotId(bot.x, bot.y), new PlotId(top.x + 1, top.y));
+                plots = MainUtil.getMaxPlotSelectionIds(world, new PlotId(bot.x, bot.y), new PlotId(top.x + 1, top.y));
                 break;
             case 2: // south = +y
-                plots = PlayerFunctions.getMaxPlotSelectionIds(world, new PlotId(bot.x, bot.y), new PlotId(top.x, top.y + 1));
+                plots = MainUtil.getMaxPlotSelectionIds(world, new PlotId(bot.x, bot.y), new PlotId(top.x, top.y + 1));
                 break;
             case 3: // west = -x
-                plots = PlayerFunctions.getMaxPlotSelectionIds(world, new PlotId(bot.x - 1, bot.y), new PlotId(top.x, top.y));
+                plots = MainUtil.getMaxPlotSelectionIds(world, new PlotId(bot.x - 1, bot.y), new PlotId(top.x, top.y));
                 break;
             default:
                 return false;
         }
-        
+        final PlotId botId = plots.get(0);
-        PlotId botId = plots.get(0);
+        final PlotId topId = plots.get(plots.size() - 1);
-        PlotId topId = plots.get(plots.size() - 1);
+        final PlotId bot1 = MainUtil.getBottomPlot(MainUtil.getPlot(world, botId)).id;
-        
+        final PlotId bot2 = MainUtil.getBottomPlot(MainUtil.getPlot(world, topId)).id;
-        PlotId bot1 = PlayerFunctions.getBottomPlot(world, PlotHelper.getPlot(world, botId)).id;
+        final PlotId top1 = MainUtil.getTopPlot(MainUtil.getPlot(world, topId)).id;
-        PlotId bot2 = PlayerFunctions.getBottomPlot(world, PlotHelper.getPlot(world, topId)).id;
+        final PlotId top2 = MainUtil.getTopPlot(MainUtil.getPlot(world, botId)).id;
-        
-        PlotId top1 = PlayerFunctions.getTopPlot(world, PlotHelper.getPlot(world, topId)).id;
-        PlotId top2 = PlayerFunctions.getTopPlot(world, PlotHelper.getPlot(world, botId)).id;
-        
         bot = new PlotId(Math.min(bot1.x, bot2.x), Math.min(bot1.y, bot2.y));
         top = new PlotId(Math.max(top1.x, top2.x), Math.max(top1.y, top2.y));
-        
+        plots = MainUtil.getMaxPlotSelectionIds(world, bot, top);
-        plots = PlayerFunctions.getMaxPlotSelectionIds(world, bot, top);
-        
         for (final PlotId myid : plots) {
-            final Plot myplot = PlotMain.getPlots(world).get(myid);
+            final Plot myplot = PlotSquared.getPlots(world).get(myid);
             if ((myplot == null) || !myplot.hasOwner() || !(myplot.getOwner().equals(UUIDHandler.getUUID(plr)) || admin)) {
-                PlayerFunctions.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString()));
+                MainUtil.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString()));
                 return false;
             }
         }
-
+        final PlotWorld plotWorld = PlotSquared.getPlotWorld(world);
-        final PlotWorld plotWorld = PlotMain.getWorldSettings(world);
+        if (PlotSquared.economy != null && plotWorld.USE_ECONOMY) {
-        if (PlotMain.useEconomy && plotWorld.USE_ECONOMY) {
             double cost = plotWorld.MERGE_PRICE;
             cost = plots.size() * cost;
             if (cost > 0d) {
-                final Economy economy = PlotMain.economy;
+                final Economy economy = PlotSquared.economy;
-                if (economy.getBalance(plr) < cost) {
+                if (EconHandler.getBalance(plr) < cost) {
                     sendMessage(plr, C.CANNOT_AFFORD_MERGE, cost + "");
                     return false;
                 }
-                economy.withdrawPlayer(plr, cost);
+                EconHandler.withdrawPlayer(plr, cost);
                 sendMessage(plr, C.REMOVED_BALANCE, cost + "");
             }
         }
-
+        //FIXME PlotMergeEvent
-        final PlotMergeEvent event = new PlotMergeEvent(world, plot, plots);
+        // boolean result = event.isCancelled();
-
+        boolean result = false;
-        Bukkit.getServer().getPluginManager().callEvent(event);
+        if (result) {
-        if (event.isCancelled()) {
+            MainUtil.sendMessage(plr, "&cMerge has been cancelled");
-            event.setCancelled(true);
-            PlayerFunctions.sendMessage(plr, "&cMerge has been cancelled");
             return false;
         }
-        PlayerFunctions.sendMessage(plr, "&cPlots have been merged");
+        MainUtil.sendMessage(plr, "&cPlots have been merged");
-        PlotHelper.mergePlots(world, plots, true);
+        MainUtil.mergePlots(world, plots, true);
-
+        MainUtil.setSign(UUIDHandler.getName(plot.owner), plot);
-        PlotHelper.setSign(world, UUIDHandler.getName(plot.owner), plot);
+        MainUtil.update(plr.getLocation());
-        PlotHelper.update(plr.getLocation());
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Move.java

@@ -18,24 +18,11 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.UUID;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.ChunkManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.TaskManager;
 
 /**
  * Created 2014-08-01 for PlotSquared
@@ -43,41 +30,39 @@ import com.intellectualcrafters.plot.util.TaskManager;
  * @author Empire92
  */
 public class Move extends SubCommand {
-
     public Move() {
         super("debugmove", "plots.admin", "plot moving debug test", "debugmove", "move", CommandCategory.DEBUG, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr == null) {
-            PlayerFunctions.sendMessage(plr, "MUST BE EXECUTED BY PLAYER");
+            MainUtil.sendMessage(plr, "MUST BE EXECUTED BY PLAYER");
         }
         if (args.length != 2) {
-            PlayerFunctions.sendMessage(plr, "/plot move <pos1> <pos2>");
+            MainUtil.sendMessage(plr, "/plot move <pos1> <pos2>");
             return false;
         }
-        World world = plr.getWorld();
+        final String world = plr.getLocation().getWorld();
-        PlotId plot1 = PlotHelper.parseId(args[0]);
+        final PlotId plot1 = MainUtil.parseId(args[0]);
-        PlotId plot2 = PlotHelper.parseId(args[1]);
+        final PlotId plot2 = MainUtil.parseId(args[1]);
-        if (plot1 == null || plot2 == null) {
+        if ((plot1 == null) || (plot2 == null)) {
-            PlayerFunctions.sendMessage(plr, "INVALID PLOT ID\n/plot move <pos1> <pos2>");
+            MainUtil.sendMessage(plr, "INVALID PLOT ID\n/plot move <pos1> <pos2>");
             return false;
         }
         if (plot1 == plot2) {
-            PlayerFunctions.sendMessage(plr, "DUPLICATE ID");
+            MainUtil.sendMessage(plr, "DUPLICATE ID");
             return false;
         }
-        if (PlotHelper.move(world, plot1, plot2, new Runnable() {
+        if (MainUtil.move(world, plot1, plot2, new Runnable() {
             @Override
             public void run() {
-                PlayerFunctions.sendMessage(plr, "MOVE SUCCESS");
+                MainUtil.sendMessage(plr, "MOVE SUCCESS");
             }
         })) {
             return true;
-        }
+        } else {
-        else {
+            MainUtil.sendMessage(plr, "MOVE FAILED");
-            PlayerFunctions.sendMessage(plr, "MOVE FAILED");
             return false;
         }
     }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java

@@ -18,21 +18,22 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.Arrays;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.listeners.PlotPlusListener;
+import com.intellectualcrafters.plot.object.BukkitPlayer;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 public class MusicSubcommand extends SubCommand {
     public MusicSubcommand() {
@@ -40,13 +41,13 @@ public class MusicSubcommand extends SubCommand {
     }
     
     @Override
-    public boolean execute(final Player player, final String... args) {
+    public boolean execute(final PlotPlayer player, final String... args) {
-        if (!PlayerFunctions.isInPlot(player)) {
+        Location loc = player.getLocation();
-            sendMessage(player, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
-            return true;
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(player);
+        if (!plot.isAdded(player.getUUID())) {
-        if (!plot.hasRights(player)) {
             sendMessage(player, C.NO_PLOT_PERMS);
             return true;
         }
@@ -59,7 +60,8 @@ public class MusicSubcommand extends SubCommand {
             stack.setItemMeta(itemMeta);
             inventory.addItem(stack);
         }
-        player.openInventory(inventory);
+        // FIXME unchecked casting
+        ((BukkitPlayer) player).player.openInventory(inventory);
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/OP.java

@@ -1,34 +0,0 @@
-package com.intellectualcrafters.plot.commands;
-
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-
-/**
- * Created 2014-11-09 for PlotSquared
- *
- * @author Citymonstret
- */
-public class OP extends SubCommand {
-
-    public OP() {
-        super(Command.OP, "Alias for /plot trusted add", "/plot op [player]", CommandCategory.ACTIONS, true);
-    }
-
-    @Override
-    public boolean execute(final Player plr, final String... args) {
-        if (args.length < 1) {
-            return PlayerFunctions.sendMessage(plr, "&cUsage: &c" + this.usage);
-        }
-        if (!PlayerFunctions.isInPlot(plr)) {
-            return sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if (!plot.hasRights(plr)) {
-            return sendMessage(plr, C.NO_PLOT_PERMS);
-        }
-        return plr.performCommand("plot trusted add " + args[0]);
-    }
-}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Paste.java

@@ -1,73 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-package com.intellectualcrafters.plot.commands;
-
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotSelection;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-
-public class Paste extends SubCommand {
-
-    public Paste() {
-        super(Command.PASTE, "Paste a plot", "paste", CommandCategory.ACTIONS, true);
-    }
-
-    @Override
-    public boolean execute(final Player plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
-            return false;
-        }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !PlotMain.hasPermission(plr, "plots.admin.command.paste")) {
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
-            return false;
-        }
-        if (!PlayerFunctions.getTopPlot(plr.getWorld(), plot).equals(PlayerFunctions.getBottomPlot(plr.getWorld(), plot))) {
-            PlayerFunctions.sendMessage(plr, C.UNLINK_REQUIRED);
-            return false;
-        }
-        assert plot != null;
-        final int size = (PlotHelper.getPlotTopLocAbs(plr.getWorld(), plot.getId()).getBlockX() - PlotHelper.getPlotBottomLocAbs(plr.getWorld(), plot.getId()).getBlockX());
-
-        if (PlotSelection.currentSelection.containsKey(plr.getName())) {
-            final PlotSelection selection = PlotSelection.currentSelection.get(plr.getName());
-            if (size != selection.getWidth()) {
-                sendMessage(plr, C.PASTE_FAILED, "The size of the current plot is not the same as the paste");
-                return false;
-            }
-            selection.paste(plr.getWorld(), plot);
-            sendMessage(plr, C.PASTED);
-        } else {
-            sendMessage(plr, C.NO_CLIPBOARD);
-            return false;
-        }
-        PlotSelection.currentSelection.remove(plr.getName());
-        return true;
-    }
-}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.Collection;
@@ -26,148 +25,143 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.BlockManager;
-
+import com.intellectualcrafters.plot.util.MainUtil;
-@SuppressWarnings({"javadoc"}) public class Purge extends SubCommand {
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
+@SuppressWarnings({ "javadoc" })
+public class Purge extends SubCommand {
     public Purge() {
         super("purge", "plots.admin", "Purge all plots for a world", "purge", "", CommandCategory.DEBUG, false);
     }
     
-    public PlotId getId(String id) {
+    public PlotId getId(final String id) {
         try {
-            String[] split = id.split(";");
+            final String[] split = id.split(";");
             return new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-        }
+        } catch (final Exception e) {
-        catch (Exception e) {
             return null;
         }
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr != null) {
-            PlayerFunctions.sendMessage(plr, (C.NOT_CONSOLE));
+            MainUtil.sendMessage(plr, (C.NOT_CONSOLE));
             return false;
         }
         if (args.length == 1) {
-            String arg = args[0].toLowerCase();
+            final String arg = args[0].toLowerCase();
-            PlotId id = getId(arg);
+            final PlotId id = getId(arg);
             if (id != null) {
-                PlayerFunctions.sendMessage(plr, "/plot purge x;z &l<world>");
+                MainUtil.sendMessage(plr, "/plot purge x;z &l<world>");
                 return false;
             }
-            UUID uuid = UUIDHandler.getUUID(args[0]);
+            final UUID uuid = UUIDHandler.getUUID(args[0]);
             if (uuid != null) {
-                PlayerFunctions.sendMessage(plr, "/plot purge "+args[0]+" &l<world>");
+                MainUtil.sendMessage(plr, "/plot purge " + args[0] + " &l<world>");
                 return false;
             }
             if (arg.equals("player")) {
-                PlayerFunctions.sendMessage(plr, "/plot purge &l<player> <world>");
+                MainUtil.sendMessage(plr, "/plot purge &l<player> <world>");
                 return false;
             }
             if (arg.equals("unowned")) {
-                PlayerFunctions.sendMessage(plr, "/plot purge unowned &l<world>");
+                MainUtil.sendMessage(plr, "/plot purge unowned &l<world>");
                 return false;
             }
             if (arg.equals("unknown")) {
-                PlayerFunctions.sendMessage(plr, "/plot purge unknown &l<world>");
+                MainUtil.sendMessage(plr, "/plot purge unknown &l<world>");
                 return false;
             }
             if (arg.equals("all")) {
-                PlayerFunctions.sendMessage(plr, "/plot purge all &l<world>");
+                MainUtil.sendMessage(plr, "/plot purge all &l<world>");
                 return false;
             }
-            PlayerFunctions.sendMessage(plr, C.PURGE_SYNTAX);
+            MainUtil.sendMessage(plr, C.PURGE_SYNTAX);
             return false;
         }
         if (args.length != 2) {
-            PlayerFunctions.sendMessage(plr, C.PURGE_SYNTAX);
+            MainUtil.sendMessage(plr, C.PURGE_SYNTAX);
             return false;
         }
-        World world = Bukkit.getWorld(args[1]);
+        final String worldname = args[0];
-        if (world == null || !PlotMain.isPlotWorld(world)) {
+        if (!BlockManager.manager.isWorld(worldname) || !PlotSquared.isPlotWorld(worldname)) {
-            PlayerFunctions.sendMessage(null, C.NOT_VALID_PLOT_WORLD);
+            MainUtil.sendMessage(plr, "INVALID WORLD");
             return false;
         }
-        String worldname = world.getName();
+        final String arg = args[0].toLowerCase();
-        String arg = args[0].toLowerCase();
+        final PlotId id = getId(arg);
-        PlotId id = getId(arg);
         if (id != null) {
-            HashSet<Integer> ids = new HashSet<Integer>();
+            final HashSet<Integer> ids = new HashSet<Integer>();
-            int DBid = DBFunc.getId(worldname, id);
+            final int DBid = DBFunc.getId(worldname, id);
             if (DBid != Integer.MAX_VALUE) {
                 ids.add(DBid);
             }
             DBFunc.purgeIds(worldname, ids);
             return finishPurge(DBid == Integer.MAX_VALUE ? 1 : 0);
         }
-        UUID uuid = UUIDHandler.getUUID(args[0]);
+        final UUID uuid = UUIDHandler.getUUID(args[0]);
         if (uuid != null) {
-            Set<Plot> plots = PlotMain.getPlots(world,uuid);
+            final Set<Plot> plots = PlotSquared.getPlots(worldname, uuid);
-            Set<PlotId> ids = new HashSet<>();
+            final Set<PlotId> ids = new HashSet<>();
-            for (Plot plot : plots) {
+            for (final Plot plot : plots) {
                 ids.add(plot.id);
             }
             DBFunc.purge(worldname, ids);
             return finishPurge(ids.size());
         }
         if (arg.equals("all")) {
-            Set<PlotId> ids = PlotMain.getPlots(world).keySet();
+            final Set<PlotId> ids = PlotSquared.getPlots(worldname).keySet();
             if (ids.size() == 0) {
-            	return PlayerFunctions.sendMessage(null, "&cNo plots found");
+                return MainUtil.sendMessage(null, "&cNo plots found");
             }
             DBFunc.purge(worldname, ids);
             return finishPurge(ids.size());
         }
         if (arg.equals("unknown")) {
-            Collection<Plot> plots = PlotMain.getPlots(world).values();
+            final Collection<Plot> plots = PlotSquared.getPlots(worldname).values();
-            Set<PlotId> ids = new HashSet<>();
+            final Set<PlotId> ids = new HashSet<>();
-            for (Plot plot : plots) {
+            for (final Plot plot : plots) {
                 if (plot.owner != null) {
-                    String name = UUIDHandler.getName(plot.owner);  
+                    final String name = UUIDHandler.getName(plot.owner);
                     if (name == null) {
                         ids.add(plot.id);
                     }
                 }
             }
             if (ids.size() == 0) {
-            	return PlayerFunctions.sendMessage(null, "&cNo plots found");
+                return MainUtil.sendMessage(null, "&cNo plots found");
             }
             DBFunc.purge(worldname, ids);
             return finishPurge(ids.size());
         }
         if (arg.equals("unowned")) {
-            Collection<Plot> plots = PlotMain.getPlots(world).values();
+            final Collection<Plot> plots = PlotSquared.getPlots(worldname).values();
-            Set<PlotId> ids = new HashSet<>();
+            final Set<PlotId> ids = new HashSet<>();
-            for (Plot plot : plots) {
+            for (final Plot plot : plots) {
                 if (plot.owner == null) {
                     ids.add(plot.id);
                 }
             }
             if (ids.size() == 0) {
-            	return PlayerFunctions.sendMessage(null, "&cNo plots found");
+                return MainUtil.sendMessage(null, "&cNo plots found");
             }
             DBFunc.purge(worldname, ids);
             return finishPurge(ids.size());
         }
-        PlayerFunctions.sendMessage(plr, C.PURGE_SYNTAX);
+        MainUtil.sendMessage(plr, C.PURGE_SYNTAX);
         return false;
     }
     
-    private boolean finishPurge(int amount) {
+    private boolean finishPurge(final int amount) {
-        PlayerFunctions.sendMessage(null, C.PURGE_SUCCESS, amount + "");
+        MainUtil.sendMessage(null, C.PURGE_SUCCESS, amount + "");
         return false;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java

@@ -18,39 +18,36 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.MainUtil;
-
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
-@SuppressWarnings({"unused", "deprecated", "javadoc"}) public class Rate extends SubCommand {
 
+public class Rate extends SubCommand {
     /*
      * String cmd, String permission, String description, String usage, String
      * alias, CommandCategory category
      */
-
     public Rate() {
         super("rate", "plots.rate", "Rate the plot", "rate {0-10}", "rt", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 1) {
             sendMessage(plr, C.RATING_NOT_VALID);
             return true;
         }
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
-            return true;
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
         if (!plot.hasOwner()) {
             sendMessage(plr, C.RATING_NOT_OWNED);
             return true;
@@ -82,7 +79,6 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
         } catch (final Exception e) {
             rated = false;
         }
-
         if (rated) {
             sendMessage(plr, C.RATING_ALREADY_EXISTS, plot.getId().toString());
         }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java

@@ -18,66 +18,50 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
+import java.util.List;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.generator.HybridPlotManager;
+import com.intellectualcrafters.plot.generator.HybridUtils;
 import com.intellectualcrafters.plot.object.ChunkLoc;
 import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.util.ChunkManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.AChunkManager;
 
 public class RegenAllRoads extends SubCommand {
-
     public RegenAllRoads() {
         super(Command.REGENALLROADS, "Regenerate all roads in the map using the set road schematic", "rgar", CommandCategory.DEBUG, false);
     }
     
     @Override
-    public boolean execute(final Player player, final String... args) {
+    public boolean execute(final PlotPlayer player, final String... args) {
-        
         if (player != null) {
             sendMessage(player, C.NOT_CONSOLE);
             return false;
         }
-        
         if (args.length != 1) {
             sendMessage(player, C.NEED_PLOT_WORLD);
             return false;
         }
-        
+        final String name = args[0];
-        String name = args[0];
+        final PlotManager manager = PlotSquared.getPlotManager(name);
-        PlotManager manager = PlotMain.getPlotManager(name);
+        if ((manager == null) || !(manager instanceof HybridPlotManager)) {
-        
-        if (manager == null || !(manager instanceof HybridPlotManager)) {
             sendMessage(player, C.NOT_VALID_PLOT_WORLD);
             return false;
         }
-
+        final List<ChunkLoc> chunks = AChunkManager.manager.getChunkChunks(name);
-        HybridPlotManager hpm = (HybridPlotManager) manager;
+        PlotSquared.log("&cIf no schematic is set, the following will not do anything");
-        
+        PlotSquared.log("&7 - To set a schematic, stand in a plot and use &c/plot createroadschematic");
-        World world = Bukkit.getWorld(name);
+        PlotSquared.log("&6Potential chunks to update: &7" + (chunks.size() * 1024));
-        ArrayList<ChunkLoc> chunks = ChunkManager.getChunkChunks(world);
+        PlotSquared.log("&6Estimated time: &7" + (chunks.size()) + " seconds");
-        
+        final boolean result = HybridUtils.manager.scheduleRoadUpdate(name);
-        PlotMain.sendConsoleSenderMessage("&cIf no schematic is set, the following will not do anything");
-        PlotMain.sendConsoleSenderMessage("&7 - To set a schematic, stand in a plot and use &c/plot createroadschematic");
-        PlotMain.sendConsoleSenderMessage("&6Potential chunks to update: &7"+ (chunks.size() * 1024));
-        PlotMain.sendConsoleSenderMessage("&6Estimated time: &7"+ (chunks.size()) + " seconds");
-        
-        boolean result = hpm.scheduleRoadUpdate(world);
-        
         if (!result) {
-            PlotMain.sendConsoleSenderMessage("&cCannot schedule mass schematic update! (Is one already in progress?)");
+            PlotSquared.log("&cCannot schedule mass schematic update! (Is one already in progress?)");
             return false;
         }
-        
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java

@@ -18,39 +18,35 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 public class Reload extends SubCommand {
-
     public Reload() {
         super("reload", "plots.admin.command.reload", "Reload configurations", "", "reload", CommandCategory.INFO, false);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         try {
             // The following won't affect world generation, as that has to be
             // loaded during startup unfortunately.
-            PlotMain.config.load(PlotMain.configFile);
+            PlotSquared.config.load(PlotSquared.configFile);
-            PlotMain.setupConfig();
+            PlotSquared.setupConfig();
             C.setupTranslations();
-            for (final String pw : PlotMain.getPlotWorlds()) {
+            for (final String pw : PlotSquared.getPlotWorlds()) {
-                final PlotWorld plotworld = PlotMain.getWorldSettings(pw);
+                final PlotWorld plotworld = PlotSquared.getPlotWorld(pw);
-                plotworld.loadDefaultConfiguration(PlotMain.config.getConfigurationSection("worlds." + pw));
+                plotworld.loadDefaultConfiguration(PlotSquared.config.getConfigurationSection("worlds." + pw));
             }
-            PlotMain.BroadcastWithPerms(C.RELOADED_CONFIGS);
+            MainUtil.sendMessage(plr, C.RELOADED_CONFIGS);
         } catch (final Exception e) {
-            PlayerFunctions.sendMessage(plr, C.RELOAD_FAILED);
+            MainUtil.sendMessage(plr, C.RELOAD_FAILED);
         }
         return true;
     }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java

@@ -18,33 +18,29 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.Collection;
 import java.util.HashMap;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
 import com.intellectualcrafters.jnbt.CompoundTag;
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SchematicHandler.DataCollection;
 import com.intellectualcrafters.plot.util.SchematicHandler.Dimension;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class Schematic extends SubCommand {
-
     private int counter = 0;
     private boolean running = false;
     private Plot[] plots;
@@ -56,7 +52,7 @@ public class Schematic extends SubCommand {
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 1) {
             sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
             return true;
@@ -65,31 +61,33 @@ public class Schematic extends SubCommand {
         final String file;
         final SchematicHandler.Schematic schematic;
         switch (arg) {
-            case "paste":
+            case "paste": {
                 if (plr == null) {
-                    PlotMain.sendConsoleSenderMessage(C.IS_CONSOLE);
+                    PlotSquared.log(C.IS_CONSOLE.s());
                     return false;
                 }
-                if (!PlotMain.hasPermission(plr, "plots.schematic.paste")) {
+                if (!Permissions.hasPermission(plr, "plots.schematic.paste")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.paste");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.paste");
                     return false;
                 }
                 if (args.length < 2) {
                     sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
                     break;
                 }
-                if (!PlayerFunctions.isInPlot(plr)) {
+                final Location loc = plr.getLocation();
+                Plot plot = MainUtil.getPlot(loc);
+                if (plot  == null) {
                     sendMessage(plr, C.NOT_IN_PLOT);
                     break;
                 }
                 if (this.running) {
-                    PlayerFunctions.sendMessage(plr, "&cTask is already running.");
+                    MainUtil.sendMessage(plr, "&cTask is already running.");
                     return false;
                 }
                 final String file2 = args[1];
                 this.running = true;
                 this.counter = 0;
-                Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
+                TaskManager.runTaskAsync(new Runnable() {
                     @Override
                     public void run() {
                         final SchematicHandler.Schematic schematic = SchematicHandler.getSchematic(file2);
@@ -98,40 +96,32 @@ public class Schematic extends SubCommand {
                             Schematic.this.running = false;
                             return;
                         }
-
                         final int x;
                         final int z;
-
+                        final Plot plot2 = MainUtil.getPlot(loc);
-                        final Plot plot2 = PlayerFunctions.getCurrentPlot(plr);
-
                         final Dimension dem = schematic.getSchematicDimension();
-                        final Location bot = PlotHelper.getPlotBottomLoc(plr.getWorld(), plot2.id).add(1, 0, 1);
+                        final Location bot = MainUtil.getPlotBottomLoc(loc.getWorld(), plot2.id).add(1, 0, 1);
-                        final int length2 = PlotHelper.getPlotWidth(plr.getWorld(), plot2.id);
+                        final int length2 = MainUtil.getPlotWidth(loc.getWorld(), plot2.id);
-
                         if ((dem.getX() > length2) || (dem.getZ() > length2)) {
                             sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", dem.getX(), dem.getZ(), length2));
                             Schematic.this.running = false;
                             return;
                         }
-
                         if ((dem.getX() != length2) || (dem.getZ() != length2)) {
                             final Location loc = plr.getLocation();
-                            x = Math.min(length2 - dem.getX(), loc.getBlockX() - bot.getBlockX());
+                            x = Math.min(length2 - dem.getX(), loc.getX() - bot.getX());
-                            z = Math.min(length2 - dem.getZ(), loc.getBlockZ() - bot.getBlockZ());
+                            z = Math.min(length2 - dem.getZ(), loc.getZ() - bot.getZ());
                         } else {
                             x = 0;
                             z = 0;
                         }
-
-                        final World w = plot2.getWorld();
                         final DataCollection[] b = schematic.getBlockCollection();
-                        final int sy = w.getHighestBlockYAt(bot.getBlockX(), bot.getBlockZ());
+                        final int sy = BlockManager.manager.getHeighestBlock(bot);
                         final Location l1 = bot.add(0, sy - 1, 0);
                         final int WIDTH = schematic.getSchematicDimension().getX();
                         final int LENGTH = schematic.getSchematicDimension().getZ();
                         final int blen = b.length - 1;
-
+                        Schematic.this.task = TaskManager.runTaskRepeat(new Runnable() {
-                        Schematic.this.task = Bukkit.getScheduler().scheduleSyncRepeatingTask(PlotMain.getMain(), new Runnable() {
                             @Override
                             public void run() {
                                 boolean result = false;
@@ -139,27 +129,28 @@ public class Schematic extends SubCommand {
                                     final int start = Schematic.this.counter * 5000;
                                     if (start > blen) {
                                         sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS);
-                                        PlotHelper.update(plr.getLocation());
+                                        MainUtil.update(plr.getLocation());
                                         Schematic.this.running = false;
-                                        Bukkit.getScheduler().cancelTask(Schematic.this.task);
+                                        PlotSquared.TASK.cancelTask(Schematic.this.task);
                                         return;
                                     }
                                     final int end = Math.min(start + 5000, blen);
-                                    result = SchematicHandler.pastePart(w, b, l1, x, z, start, end, WIDTH, LENGTH);
+                                    result = SchematicHandler.pastePart(loc.getWorld(), b, l1, x, z, start, end, WIDTH, LENGTH);
                                     Schematic.this.counter++;
                                 }
                             }
-                        }, 1, 1);
+                        }, 1);
                     }
                 });
                 break;
-            case "test":
+            }
+            case "test": {
                 if (plr == null) {
-                    PlotMain.sendConsoleSenderMessage(C.IS_CONSOLE);
+                    PlotSquared.log(C.IS_CONSOLE.s());
                     return false;
                 }
-                if (!PlotMain.hasPermission(plr, "plots.schematic.test")) {
+                if (!Permissions.hasPermission(plr, "plots.schematic.test")) {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test");
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test");
                     return false;
                 }
                 if (args.length < 2) {
@@ -172,172 +163,165 @@ public class Schematic extends SubCommand {
                     sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent");
                     break;
                 }
-
+                Location loc = plr.getLocation();
                 final int l1 = schematic.getSchematicDimension().getX();
                 final int l2 = schematic.getSchematicDimension().getZ();
-
+                final Plot plot = MainUtil.getPlot(loc);
-                final Plot plot = PlayerFunctions.getCurrentPlot(plr);
+                final int length = MainUtil.getPlotWidth(loc.getWorld(), plot.id);
-                final int length = PlotHelper.getPlotWidth(plr.getWorld(), plot.id);
-
                 if ((l1 < length) || (l2 < length)) {
                     sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length));
                     break;
                 }
                 sendMessage(plr, C.SCHEMATIC_VALID);
                 break;
+            }
             case "saveall":
-            case "exportall":
+            case "exportall": {
                 if (plr != null) {
-                    PlayerFunctions.sendMessage(plr, C.NOT_CONSOLE);
+                    MainUtil.sendMessage(plr, C.NOT_CONSOLE);
                     return false;
                 }
                 if (args.length != 2) {
-                    PlayerFunctions.sendMessage(null, "&cNeed world arg. Use &7/plots sch exportall <world>");
+                    MainUtil.sendMessage(null, "&cNeed world arg. Use &7/plots sch exportall <world>");
                     return false;
                 }
-                final HashMap<PlotId, Plot> plotmap = PlotMain.getPlots(args[1]);
+                final HashMap<PlotId, Plot> plotmap = PlotSquared.getPlots(args[1]);
                 if ((plotmap == null) || (plotmap.size() == 0)) {
-                    PlayerFunctions.sendMessage(null, "&cInvalid world. Use &7/plots sch exportall <world>");
+                    MainUtil.sendMessage(null, "&cInvalid world. Use &7/plots sch exportall <world>");
                     return false;
                 }
                 if (this.running) {
-                    PlayerFunctions.sendMessage(null, "&cTask is already running.");
+                    MainUtil.sendMessage(null, "&cTask is already running.");
                     return false;
                 }
-
+                PlotSquared.log("&3PlotSquared&8->&3Schemaitc&8: &7Mass export has started. This may take a while.");
-                PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &7Mass export has started. This may take a while.");
+                PlotSquared.log("&3PlotSquared&8->&3Schemaitc&8: &7Found &c" + plotmap.size() + "&7 plots...");
-                PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &7Found &c" + plotmap.size() + "&7 plots...");
+                final String worldname = args[1];
-                final World worldObj = Bukkit.getWorld(args[1]);
-                final String worldname = Bukkit.getWorld(args[1]).getName();
-
-                final Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared");
-
                 final Collection<Plot> values = plotmap.values();
                 this.plots = values.toArray(new Plot[values.size()]);
                 this.running = true;
                 this.counter = 0;
-
+                this.task = TaskManager.runTaskRepeat(new Runnable() {
-                this.task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
                     @Override
                     public void run() {
                         if (Schematic.this.counter >= Schematic.this.plots.length) {
-                            PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &aFinished!");
+                            PlotSquared.log("&3PlotSquared&8->&3Schemaitc&8: &aFinished!");
                             Schematic.this.running = false;
-                            Bukkit.getScheduler().cancelTask(Schematic.this.task);
+                            PlotSquared.TASK.cancelTask(Schematic.this.task);
                             return;
                         }
                         final Plot plot = Schematic.this.plots[Schematic.this.counter];
-                        final CompoundTag sch = SchematicHandler.getCompoundTag(worldObj, plot.id);
+                        final CompoundTag sch = SchematicHandler.getCompoundTag(worldname, plot.id);
                         final String o = UUIDHandler.getName(plot.owner);
                         final String owner = o == null ? "unknown" : o;
                         if (sch == null) {
-                            PlayerFunctions.sendMessage(null, "&7 - Skipped plot &c" + plot.id);
+                            MainUtil.sendMessage(null, "&7 - Skipped plot &c" + plot.id);
                         } else {
-                            Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
+                            TaskManager.runTaskAsync(new Runnable() {
                                 @Override
                                 public void run() {
-                                    PlayerFunctions.sendMessage(null, "&6ID: " + plot.id);
+                                    MainUtil.sendMessage(null, "&6ID: " + plot.id);
                                     final boolean result = SchematicHandler.save(sch, Settings.SCHEMATIC_SAVE_PATH + "/" + plot.id.x + ";" + plot.id.y + "," + worldname + "," + owner + ".schematic");
                                     if (!result) {
-                                        PlayerFunctions.sendMessage(null, "&7 - Failed to save &c" + plot.id);
+                                        MainUtil.sendMessage(null, "&7 - Failed to save &c" + plot.id);
                                     } else {
-                                        PlayerFunctions.sendMessage(null, "&7 - &aExport success: " + plot.id);
+                                        MainUtil.sendMessage(null, "&7 - &aExport success: " + plot.id);
                                     }
                                 }
                             });
                         }
                         Schematic.this.counter++;
                     }
-                }, 20, 20);
+                }, 20);
                 break;
+            }
             case "export":
             case "save":
-                if (!PlotMain.hasPermission(plr, "plots.schematic.save")) {
+            {
-                    PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save");
+                if (!Permissions.hasPermission(plr, "plots.schematic.save")) {
+                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save");
                     return false;
                 }
                 if (this.running) {
-                    PlayerFunctions.sendMessage(plr, "&cTask is already running.");
+                    MainUtil.sendMessage(plr, "&cTask is already running.");
                     return false;
                 }
                 final String world;
                 final Plot p2;
                 if (plr != null) {
-                    if (!PlayerFunctions.isInPlot(plr)) {
+                    Location loc = plr.getLocation();
-                        sendMessage(plr, C.NOT_IN_PLOT);
+                    final Plot plot = MainUtil.getPlot(loc);
-                        return false;
+                    if (plot == null) {
+                        return !sendMessage(plr, C.NOT_IN_PLOT);
                     }
-                    final Plot myplot = PlayerFunctions.getCurrentPlot(plr);
+                    if (!plot.isAdded(plr.getUUID())) {
-                    if (!myplot.hasRights(plr)) {
                         sendMessage(plr, C.NO_PLOT_PERMS);
                         return false;
                     }
-                    p2 = myplot;
+                    p2 = plot;
-                    world = plr.getWorld().getName();
+                    world = loc.getWorld();
                 } else {
                     if (args.length == 3) {
                         try {
                             world = args[0];
                             final String[] split = args[2].split(";");
                             final PlotId i = new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-                            if ((PlotMain.getPlots(world) == null) || (PlotMain.getPlots(world).get(i) == null)) {
+                            if ((PlotSquared.getPlots(world) == null) || (PlotSquared.getPlots(world).get(i) == null)) {
-                                PlayerFunctions.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
+                                MainUtil.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
                                 return false;
                             }
-                            p2 = PlotMain.getPlots(world).get(i);
+                            p2 = PlotSquared.getPlots(world).get(i);
                         } catch (final Exception e) {
-                            PlayerFunctions.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
+                            MainUtil.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
                             return false;
                         }
                     } else {
-                        PlayerFunctions.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
+                        MainUtil.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save <world> <id>");
                         return false;
                     }
                 }
-
+                this.plots = new Plot[] { p2 };
-                final Plugin plugin2 = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared");
-
-                this.plots = new Plot[]{p2};
                 this.running = true;
                 this.counter = 0;
-
+                this.task = TaskManager.runTaskRepeat(new Runnable() {
-                this.task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin2, new Runnable() {
                     @Override
                     public void run() {
                         if (Schematic.this.counter >= Schematic.this.plots.length) {
-                            PlotMain.sendConsoleSenderMessage("&3PlotSquared&8->&3Schemaitc&8: &aFinished!");
+                            PlotSquared.log("&3PlotSquared&8->&3Schemaitc&8: &aFinished!");
                             Schematic.this.running = false;
-                            Bukkit.getScheduler().cancelTask(Schematic.this.task);
+                            PlotSquared.TASK.cancelTask(Schematic.this.task);
                             return;
                         }
                         final Plot plot = Schematic.this.plots[Schematic.this.counter];
-                        final CompoundTag sch = SchematicHandler.getCompoundTag(Bukkit.getWorld(world), plot.id);
+                        final CompoundTag sch = SchematicHandler.getCompoundTag(world, plot.id);
                         final String o = UUIDHandler.getName(plot.owner);
                         final String owner = o == null ? "unknown" : o;
                         if (sch == null) {
-                            PlayerFunctions.sendMessage(plr, "&7 - Skipped plot &c" + plot.id);
+                            MainUtil.sendMessage(plr, "&7 - Skipped plot &c" + plot.id);
                         } else {
-                            Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
+                            TaskManager.runTaskAsync(new Runnable() {
                                 @Override
                                 public void run() {
-                                    PlayerFunctions.sendMessage(plr, "&6ID: " + plot.id);
+                                    MainUtil.sendMessage(plr, "&6ID: " + plot.id);
                                     final boolean result = SchematicHandler.save(sch, Settings.SCHEMATIC_SAVE_PATH + "/" + plot.id.x + ";" + plot.id.y + "," + world + "," + owner.trim() + ".schematic");
                                     if (!result) {
-                                        PlayerFunctions.sendMessage(plr, "&7 - Failed to save &c" + plot.id);
+                                        MainUtil.sendMessage(plr, "&7 - Failed to save &c" + plot.id);
                                     } else {
-                                        PlayerFunctions.sendMessage(plr, "&7 - &aExport success: " + plot.id);
+                                        MainUtil.sendMessage(plr, "&7 - &aExport success: " + plot.id);
                                     }
                                 }
                             });
                         }
                         Schematic.this.counter++;
                     }
-                }, 20, 60);
+                }, 60);
                 break;
-            default:
+            }
+            default: {
                 sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
                 break;
             }
+        }
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java

@@ -18,49 +18,39 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Configuration;
-import com.intellectualcrafters.plot.config.Configuration.SettingValue;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.flag.AbstractFlag;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.flag.FlagValue;
 import com.intellectualcrafters.plot.listeners.PlotListener;
 import com.intellectualcrafters.plot.object.BlockLoc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.PlotManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.StringWrapper;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.BlockManager;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.StringComparison;
+import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * @author Citymonstret
  */
 public class Set extends SubCommand {
-
+    public final static String[] values = new String[] { "biome", "wall", "wall_filling", "floor", "alias", "home", "flag" };
-    public final static String[] values = new String[]{"biome", "wall", "wall_filling", "floor", "alias", "home", "flag"};
+    public final static String[] aliases = new String[] { "b", "w", "wf", "f", "a", "h", "fl" };
-    public final static String[] aliases = new String[]{"b", "w", "wf", "f", "a", "h", "fl"};
     
     public Set() {
         super(Command.SET, "Set a plot value", "set {arg} {value...}", CommandCategory.ACTIONS, true);
@@ -68,22 +58,22 @@ public class Set extends SubCommand {
     
     @SuppressWarnings("deprecation")
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
-            return false;
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
         if (!plot.hasOwner()) {
             sendMessage(plr, C.PLOT_NOT_CLAIMED);
             return false;
         }
-        if (!plot.hasRights(plr) && !PlotMain.hasPermission(plr, "plots.admin.command.set")) {
+        if (!plot.isAdded(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.set")) {
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
+            MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
         if (args.length < 1) {
-            PlayerFunctions.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(values));
+            MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(values));
             return false;
         }
         for (int i = 0; i < aliases.length; i++) {
@@ -94,146 +84,118 @@ public class Set extends SubCommand {
         }
         /* TODO: Implement option */
         // final boolean advanced_permissions = true;
-        if (!PlotMain.hasPermission(plr, "plots.set." + args[0].toLowerCase())) {
+        if (!Permissions.hasPermission(plr, "plots.set." + args[0].toLowerCase())) {
-            PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.set." + args[0].toLowerCase());
+            MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.set." + args[0].toLowerCase());
             return false;
         }
-
         if (args[0].equalsIgnoreCase("flag")) {
             if (args.length < 2) {
                 String message = StringUtils.join(FlagManager.getFlags(plr), "&c, &6");
-                if (PlotMain.worldGuardListener != null) {
+                MainUtil.sendMessage(plr, C.NEED_KEY.s().replaceAll("%values%", message));
-                    if (message.equals("")) {
-                        message = StringUtils.join(PlotMain.worldGuardListener.str_flags, "&c, &6");
-                    } else {
-                        message += "," + StringUtils.join(PlotMain.worldGuardListener.str_flags, "&c, &6");
-                    }
-                }
-                PlayerFunctions.sendMessage(plr, C.NEED_KEY.s().replaceAll("%values%", message));
                 return false;
             }
-
             AbstractFlag af;
-
             try {
                 af = FlagManager.getFlag(args[1].toLowerCase());
             } catch (final Exception e) {
                 af = new AbstractFlag(args[1].toLowerCase());
             }
-
+            if (!FlagManager.getFlags().contains(af)) {
-            if (!FlagManager.getFlags().contains(af) && ((PlotMain.worldGuardListener == null) || !PlotMain.worldGuardListener.str_flags.contains(args[1].toLowerCase()))) {
+                MainUtil.sendMessage(plr, C.NOT_VALID_FLAG);
-                PlayerFunctions.sendMessage(plr, C.NOT_VALID_FLAG);
                 return false;
             }
-            if (!PlotMain.hasPermission(plr, "plots.set.flag." + args[1].toLowerCase())) {
+            if (!Permissions.hasPermission(plr, "plots.set.flag." + args[1].toLowerCase())) {
-                PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
+                MainUtil.sendMessage(plr, C.NO_PERMISSION);
                 return false;
             }
             if (args.length == 2) {
                 if (FlagManager.getPlotFlagAbs(plot, args[1].toLowerCase()) == null) {
-                    if (PlotMain.worldGuardListener != null) {
+                    MainUtil.sendMessage(plr, C.FLAG_NOT_IN_PLOT);
-                        if (PlotMain.worldGuardListener.str_flags.contains(args[1].toLowerCase())) {
-                            PlotMain.worldGuardListener.removeFlag(plr, plr.getWorld(), plot, args[1]);
                     return false;
                 }
-                    }
+                final boolean result = FlagManager.removePlotFlag(plot, args[1].toLowerCase());
-                    PlayerFunctions.sendMessage(plr, C.FLAG_NOT_IN_PLOT);
-                    return false;
-                }
-                
-                boolean result = FlagManager.removePlotFlag(plot, args[1].toLowerCase());
-                
                 if (!result) {
-                    PlayerFunctions.sendMessage(plr, C.FLAG_NOT_REMOVED);
+                    MainUtil.sendMessage(plr, C.FLAG_NOT_REMOVED);
                     return false;
                 }
-                PlayerFunctions.sendMessage(plr, C.FLAG_REMOVED);
+                MainUtil.sendMessage(plr, C.FLAG_REMOVED);
                 PlotListener.plotEntry(plr, plot);
                 return true;
             }
             try {
-                String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " ");
+                final String value = StringUtils.join(Arrays.copyOfRange(args, 2, args.length), " ");
-                Object parsed_value = af.parseValueRaw(value);
+                final Object parsed_value = af.parseValueRaw(value);
                 if (parsed_value == null) {
-                    PlayerFunctions.sendMessage(plr, af.getValueDesc());
+                    MainUtil.sendMessage(plr, af.getValueDesc());
                     return false;
                 }
-
-                if ((FlagManager.getFlag(args[1].toLowerCase()) == null) && (PlotMain.worldGuardListener != null)) {
-                    PlotMain.worldGuardListener.addFlag(plr, plr.getWorld(), plot, args[1], af.toString(parsed_value));
-                    return false;
-                }
-
                 final Flag flag = new Flag(FlagManager.getFlag(args[1].toLowerCase(), true), parsed_value);
-                boolean result = FlagManager.addPlotFlag(plot, flag);
+                final boolean result = FlagManager.addPlotFlag(plot, flag);
                 if (!result) {
-                    PlayerFunctions.sendMessage(plr, C.FLAG_NOT_ADDED);
+                    MainUtil.sendMessage(plr, C.FLAG_NOT_ADDED);
                     return false;
                 }
-                PlayerFunctions.sendMessage(plr, C.FLAG_ADDED);
+                MainUtil.sendMessage(plr, C.FLAG_ADDED);
                 PlotListener.plotEntry(plr, plot);
                 return true;
             } catch (final Exception e) {
-                PlayerFunctions.sendMessage(plr, "&c" + e.getMessage());
+                MainUtil.sendMessage(plr, "&c" + e.getMessage());
                 return false;
             }
         }
-
         if (args[0].equalsIgnoreCase("home")) {
             if (args.length > 1) {
                 if (args[1].equalsIgnoreCase("none")) {
                     plot.settings.setPosition(null);
-                    DBFunc.setPosition(plr.getWorld().getName(), plot, "");
+                    DBFunc.setPosition(loc.getWorld(), plot, "");
                     return true;
                 }
-                return PlayerFunctions.sendMessage(plr, C.HOME_ARGUMENT);
+                return MainUtil.sendMessage(plr, C.HOME_ARGUMENT);
             }
             //set to current location
-            World world = plr.getWorld();
+            final String world = plr.getLocation().getWorld();
-            Location base = PlotHelper.getPlotBottomLoc(world, plot.id);
+            final Location base = MainUtil.getPlotBottomLoc(world, plot.id);
             base.setY(0);
-            Location relative = plr.getLocation().subtract(base);
+            final Location relative = plr.getLocation().subtract(base.getX(), base.getZ(), base.getY());
-            BlockLoc blockloc = new BlockLoc(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ());
+            final BlockLoc blockloc = new BlockLoc(relative.getX(), relative.getY(), relative.getZ());
             plot.settings.setPosition(blockloc);
-            DBFunc.setPosition(plr.getWorld().getName(), plot, relative.getBlockX() + "," + relative.getBlockY() + "," + relative.getBlockZ());
+            DBFunc.setPosition(loc.getWorld(), plot, relative.getX() + "," + relative.getY() + "," + relative.getZ());
-            return PlayerFunctions.sendMessage(plr, C.POSITION_SET);
+            return MainUtil.sendMessage(plr, C.POSITION_SET);
         }
-
         if (args[0].equalsIgnoreCase("alias")) {
             if (args.length < 2) {
-                PlayerFunctions.sendMessage(plr, C.MISSING_ALIAS);
+                MainUtil.sendMessage(plr, C.MISSING_ALIAS);
                 return false;
             }
             final String alias = args[1];
             if (alias.length() >= 50) {
-                PlayerFunctions.sendMessage(plr, C.ALIAS_TOO_LONG);
+                MainUtil.sendMessage(plr, C.ALIAS_TOO_LONG);
                 return false;
             }
-            for (final Plot p : PlotMain.getPlots(plr.getWorld()).values()) {
+            for (final Plot p : PlotSquared.getPlots(plr.getLocation().getWorld()).values()) {
                 if (p.settings.getAlias().equalsIgnoreCase(alias)) {
-                    PlayerFunctions.sendMessage(plr, C.ALIAS_IS_TAKEN);
+                    MainUtil.sendMessage(plr, C.ALIAS_IS_TAKEN);
                     return false;
                 }
                 if (UUIDHandler.nameExists(new StringWrapper(alias))) {
-                    PlayerFunctions.sendMessage(plr, C.ALIAS_IS_TAKEN);
+                    MainUtil.sendMessage(plr, C.ALIAS_IS_TAKEN);
                     return false;
                 }
             }
-            DBFunc.setAlias(plr.getWorld().getName(), plot, alias);
+            DBFunc.setAlias(loc.getWorld(), plot, alias);
-            PlayerFunctions.sendMessage(plr, C.ALIAS_SET_TO.s().replaceAll("%alias%", alias));
+            MainUtil.sendMessage(plr, C.ALIAS_SET_TO.s().replaceAll("%alias%", alias));
             return true;
         }
         if (args[0].equalsIgnoreCase("biome")) {
             if (args.length < 2) {
-                PlayerFunctions.sendMessage(plr, C.NEED_BIOME);
+                MainUtil.sendMessage(plr, C.NEED_BIOME);
                 return true;
             }
             if (args[1].length() < 2) {
                 sendMessage(plr, C.NAME_LITTLE, "Biome", args[1].length() + "", "2");
                 return true;
             }
-
+            final int biome = BlockManager.manager.getBiomeFromString(args[1]);
-            final Biome biome = Biome.valueOf(new StringComparison(args[1], Biome.values()).getBestMatch());
             /*
              * for (Biome b : Biome.values()) {
              * if (b.toString().equalsIgnoreCase(args[1])) {
@@ -242,41 +204,38 @@ public class Set extends SubCommand {
              * }
              * }
              */
-
+            if (biome == -1) {
-            if (biome == null) {
+                MainUtil.sendMessage(plr, getBiomeList(BlockManager.manager.getBiomeList()));
-                PlayerFunctions.sendMessage(plr, getBiomeList(Arrays.asList(Biome.values())));
                 return true;
             }
-            PlotHelper.setBiome(plr.getWorld(), plot, biome);
+            MainUtil.setBiome(plr.getLocation().getWorld(), plot, args[1].toUpperCase());
-            PlayerFunctions.sendMessage(plr, C.BIOME_SET_TO.s() + biome.toString().toLowerCase());
+            MainUtil.sendMessage(plr, C.BIOME_SET_TO.s() + args[1].toLowerCase());
             return true;
         }
-        
         // Get components
-        World world = plr.getWorld();
+        final String world = plr.getLocation().getWorld();
-        final PlotWorld plotworld = PlotMain.getWorldSettings(world);
+        final PlotWorld plotworld = PlotSquared.getPlotWorld(world);
-        PlotManager manager = PlotMain.getPlotManager(world);
+        final PlotManager manager = PlotSquared.getPlotManager(world);
-        String[] components = manager.getPlotComponents(world, plotworld, plot.id);
+        final String[] components = manager.getPlotComponents(plotworld, plot.id);
-        for (String component : components) {
+        for (final String component : components) {
             if (component.equalsIgnoreCase(args[0])) {
                 if (args.length < 2) {
-                    PlayerFunctions.sendMessage(plr, C.NEED_BLOCK);
+                    MainUtil.sendMessage(plr, C.NEED_BLOCK);
                     return true;
                 }
                 PlotBlock[] blocks;
                 try {
                     blocks = (PlotBlock[]) Configuration.BLOCKLIST.parseObject(args[2]);
-                }
+                } catch (final Exception e) {
-                catch (Exception e) {
                     try {
-                        blocks = new PlotBlock[] {new PlotBlock((short) getMaterial(args[1], PlotWorld.BLOCKS).getId(), (byte) 0)};
+                        blocks = new PlotBlock[] { new PlotBlock((short) BlockManager.manager.getBlockIdFromString(args[2]), (byte) 0) };
-                  } catch (Exception e2) {
+                    } catch (final Exception e2) {
-                      PlayerFunctions.sendMessage(plr, C.NOT_VALID_BLOCK);
+                        MainUtil.sendMessage(plr, C.NOT_VALID_BLOCK);
                         return false;
                     }
                 }
-                manager.setComponent(world, plotworld, plot.id, component, blocks);
+                manager.setComponent(plotworld, plot.id, component, blocks);
-                PlayerFunctions.sendMessage(plr, C.GENERATING_COMPONENT);
+                MainUtil.sendMessage(plr, C.GENERATING_COMPONENT);
                 return true;
             }
         }
@@ -294,24 +253,16 @@ public class Set extends SubCommand {
                         a.append(" ").append(args[x]);
                     }
                 }
-                plr.performCommand("plot set flag " + args[0] + a.toString());
+                MainCommand.onCommand(plr, world, ("plot set flag " + args[0] + a.toString()).split(" "));
                 return true;
             }
         }
-        PlayerFunctions.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(values));
+        MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(values));
         return false;
     }
     
-    private String getMaterial(final Material m) {
-        return ChatColor.translateAlternateColorCodes('&', C.BLOCK_LIST_ITEM.s().replaceAll("%mat%", m.toString().toLowerCase()));
-    }
-
-    private String getBiome(final Biome b) {
-        return ChatColor.translateAlternateColorCodes('&', C.BLOCK_LIST_ITEM.s().replaceAll("%mat%", b.toString().toLowerCase()));
-    }
-
     private String getString(final String s) {
-        return ChatColor.translateAlternateColorCodes('&', C.BLOCK_LIST_ITEM.s().replaceAll("%mat%", s));
+        return MainUtil.colorise('&', C.BLOCK_LIST_ITEM.s().replaceAll("%mat%", s));
     }
     
     private String getArgumentList(final String[] strings) {
@@ -322,26 +273,12 @@ public class Set extends SubCommand {
         return builder.toString().substring(1, builder.toString().length() - 1);
     }
     
-    private String getBiomeList(final List<Biome> biomes) {
+    private String getBiomeList(final String[] biomes) {
         final StringBuilder builder = new StringBuilder();
-        builder.append(ChatColor.translateAlternateColorCodes('&', C.NOT_VALID_BLOCK_LIST_HEADER.s()));
+        builder.append(MainUtil.colorise('&', C.NOT_VALID_BLOCK_LIST_HEADER.s()));
-        for (final Biome b : biomes) {
+        for (final String b : biomes) {
-            builder.append(getBiome(b));
+            builder.append(getString(b));
         }
         return builder.toString().substring(1, builder.toString().length() - 1);
     }
-
-    private Material getMaterial(final String input, final List<Material> blocks) {
-        return Material.valueOf(new StringComparison(input, blocks.toArray()).getBestMatch());
-    }
-
-    private String getBlockList(final List<Material> blocks) {
-        final StringBuilder builder = new StringBuilder();
-        builder.append(ChatColor.translateAlternateColorCodes('&', C.NOT_VALID_BLOCK_LIST_HEADER.s()));
-        for (final Material b : blocks) {
-            builder.append(getMaterial(b));
-        }
-        return builder.toString().substring(1, builder.toString().length() - 1);
-    }
-
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java

@@ -18,26 +18,23 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 import java.util.UUID;
 
-import org.bukkit.World;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class SetOwner extends SubCommand {
-
     public SetOwner() {
         super("setowner", "plots.set.owner", "Set the plot owner", "setowner {player}", "so", CommandCategory.ACTIONS, true);
     }
@@ -47,51 +44,43 @@ public class SetOwner extends SubCommand {
      * Bukkit.getOfflinePlayer(string); return ((player != null) &&
      * player.hasPlayedBefore()) ? UUIDHandler.getUUID(player) : null; }
      */
-
     private UUID getUUID(final String string) {
         return UUIDHandler.getUUID(string);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        Plot plot = PlayerFunctions.getCurrentPlot(plr);
+        Location loc = plr.getLocation();
-        if (plot == null || plot.owner == null) {
+        final Plot plot = MainUtil.getPlot(loc);
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
+        if ((plot == null) || (plot.owner == null)) {
+            MainUtil.sendMessage(plr, C.NOT_IN_PLOT);
             return false;
         }
         if (args.length < 1) {
-            PlayerFunctions.sendMessage(plr, C.NEED_USER);
+            MainUtil.sendMessage(plr, C.NEED_USER);
             return false;
         }
-        
+        if (!plot.owner.equals(UUIDHandler.getUUID(plr)) && !Permissions.hasPermission(plr, "plots.admin.command.setowner")) {
-        if (!plot.owner.equals(UUIDHandler.getUUID(plr)) && !PlotMain.hasPermission(plr, "plots.admin.command.setowner")) {
+            MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command.setowner");
-            PlayerFunctions.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command.setowner");
             return false;
         }
-        final World world = plr.getWorld();
+        final String world = loc.getWorld();
-        final PlotId bot = PlayerFunctions.getBottomPlot(world, plot).id;
+        final PlotId bot = MainUtil.getBottomPlot(plot).id;
-        final PlotId top = PlayerFunctions.getTopPlot(world, plot).id;
+        final PlotId top = MainUtil.getTopPlot( plot).id;
-        final ArrayList<PlotId> plots = PlayerFunctions.getPlotSelectionIds(bot, top);
+        final ArrayList<PlotId> plots = MainUtil.getPlotSelectionIds(bot, top);
         for (final PlotId id : plots) {
-            final Plot current = PlotMain.getPlots(world).get(id);
+            final Plot current = PlotSquared.getPlots(world).get(id);
-            
+            final UUID uuid = getUUID(args[0]);
-            UUID uuid = getUUID(args[0]);
-            
             if (uuid == null) {
-                PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER, args[0]);
+                MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
                 return false;
             }
-            
             current.owner = uuid;
-            PlotMain.updatePlot(current);
+            PlotSquared.updatePlot(current);
             DBFunc.setOwner(current, current.owner);
-
-            if (PlotMain.worldGuardListener != null) {
-                PlotMain.worldGuardListener.changeOwner(plr, current.owner, plr.getWorld(), current);
         }
-        }
+        MainUtil.setSign(args[0], plot);
-        PlotHelper.setSign(world, args[0], plot);
+        MainUtil.sendMessage(plr, C.SET_OWNER);
-        PlayerFunctions.sendMessage(plr, C.SET_OWNER);
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Setup.java

@@ -18,180 +18,116 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import java.io.IOException;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.World.Environment;
-import org.bukkit.WorldCreator;
-import org.bukkit.entity.Player;
-import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.plugin.Plugin;
 
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.ConfigurationNode;
 import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.generator.SquarePlotManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.PlotGenerator;
+import com.intellectualcrafters.plot.object.SetupObject;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.SetupUtils;
 
 public class Setup extends SubCommand {
-
-    public final static Map<String, SetupObject> setupMap = new HashMap<>();
-    public HashMap<String, PlotGenerator> generators = new HashMap<>();
-    
     public Setup() {
         super("setup", "plots.admin.command.setup", "Plotworld setup command", "setup", "create", CommandCategory.ACTIONS, true);
     }
     
-    private class SetupObject {
-        int current = 0;
-        int setup_index = 0;
-        String world = null;
-        String generator = null;
-        int type = 0;
-        int terrain = 0;
-        ConfigurationNode[] step = null;
-    }
-
-    public void updateGenerators() {
-        if (generators.size() > 0) {
-            return;
-        }
-        String testWorld = "CheckingPlotSquaredGenerator";
-        for (final Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
-            if (plugin.isEnabled()) {
-                ChunkGenerator generator = plugin.getDefaultWorldGenerator(testWorld, "");
-                if (generator != null) {
-                    PlotMain.removePlotWorld(testWorld);
-                    final String name = plugin.getDescription().getName();
-                    if (generator instanceof PlotGenerator) {
-                        PlotGenerator pgen = (PlotGenerator) generator;
-                        if (pgen.getPlotManager() instanceof SquarePlotManager) {
-                            generators.put(name, pgen);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         // going through setup
-        
+        final String name = plr.getName();
-        String name = plr.getName();
+        if (!SetupUtils.setupMap.containsKey(name)) {
-        if (!setupMap.containsKey(name)) {
+            final SetupObject object = new SetupObject();
-            SetupObject object = new SetupObject();
+            SetupUtils.setupMap.put(name, object);
-            setupMap.put(name, object);
+            SetupUtils.manager.updateGenerators();
-            updateGenerators();
+            final String prefix = "\n&8 - &7";
-            String prefix = "\n&8 - &7";
             sendMessage(plr, C.SETUP_INIT);
-            PlayerFunctions.sendMessage(plr, "&6What generator do you want?" + prefix + StringUtils.join(generators.keySet(), prefix).replaceAll("PlotSquared", "&2PlotSquared"));
+            MainUtil.sendMessage(plr, "&6What generator do you want?" + prefix + StringUtils.join(SetupUtils.generators.keySet(), prefix).replaceAll("PlotSquared", "&2PlotSquared"));
             return false;
         }
         if (args.length == 1) {
             if (args[0].equalsIgnoreCase("cancel")) {
-                setupMap.remove(plr.getName());
+                SetupUtils.setupMap.remove(plr.getName());
-                PlayerFunctions.sendMessage(plr, "&aCancelled setup");
+                MainUtil.sendMessage(plr, "&aCancelled setup");
                 return false;
             }
             if (args[0].equalsIgnoreCase("back")) {
-                SetupObject object = setupMap.get(plr.getName());
+                final SetupObject object = SetupUtils.setupMap.get(plr.getName());
                 if (object.setup_index > 0) {
                     object.setup_index--;
-                    ConfigurationNode node = object.step[object.current];
+                    final ConfigurationNode node = object.step[object.current];
                     sendMessage(plr, C.SETUP_STEP, object.current + 1 + "", node.getDescription(), node.getType().getType(), node.getDefaultValue() + "");
                     return false;
-                }
+                } else if (object.current > 0) {
-                else if (object.current > 0 ){
                     object.current--;
                 }
             }
         }
-        SetupObject object = setupMap.get(name);
+        final SetupObject object = SetupUtils.setupMap.get(name);
-        int index = object.current;
+        final int index = object.current;
-        switch(index) {
+        switch (index) {
             case 0: { // choose generator
-                if (args.length != 1 || !generators.containsKey(args[0])) {
+                if ((args.length != 1) || !SetupUtils.generators.containsKey(args[0])) {
-                    String prefix = "\n&8 - &7";
+                    final String prefix = "\n&8 - &7";
-                    PlayerFunctions.sendMessage(plr, "&cYou must choose a generator!" + prefix + StringUtils.join(generators.keySet(), prefix).replaceAll("PlotSquared", "&2PlotSquared"));
+                    MainUtil.sendMessage(plr, "&cYou must choose a generator!" + prefix + StringUtils.join(SetupUtils.generators.keySet(), prefix).replaceAll("PlotSquared", "&2PlotSquared"));
                     sendMessage(plr, C.SETUP_INIT);
                     return false;
                 }
                 object.generator = args[0];
                 object.current++;
-                
+                final String partial = Settings.ENABLE_CLUSTERS ? "\n&8 - &7PARTIAL&8 - &7Vanilla with clusters of plots" : "";
-                String partial = Settings.ENABLE_CLUSTERS ? "\n&8 - &7PARTIAL&8 - &7Vanilla with clusters of plots" : "";  
+                MainUtil.sendMessage(plr, "&6What world type do you want?" + "\n&8 - &2DEFAULT&8 - &7Standard plot generation" + "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain" + partial);
-                PlayerFunctions.sendMessage(plr, "&6What world type do you want?"
-                + "\n&8 - &2DEFAULT&8 - &7Standard plot generation"
-                + "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain"
-                + partial);
                 break;
             }
             case 1: { // choose world type
                 List<String> types;
                 if (Settings.ENABLE_CLUSTERS) {
-                    types = Arrays.asList(new String[] {"default", "augmented", "partial"});
+                    types = Arrays.asList(new String[] { "default", "augmented", "partial" });
+                } else {
+                    types = Arrays.asList(new String[] { "default", "augmented" });
                 }
-                else {
+                if ((args.length != 1) || !types.contains(args[0].toLowerCase())) {
-                    types = Arrays.asList(new String[] {"default", "augmented"});
+                    MainUtil.sendMessage(plr, "&cYou must choose a world type!" + "\n&8 - &2DEFAULT&8 - &7Standard plot generation" + "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain" + "\n&8 - &7PARTIAL&8 - &7Vanilla with clusters of plots");
-                }
-                if (args.length != 1 || !types.contains(args[0].toLowerCase())) {
-                    PlayerFunctions.sendMessage(plr, "&cYou must choose a world type!"
-                    + "\n&8 - &2DEFAULT&8 - &7Standard plot generation"
-                    + "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain"
-                    + "\n&8 - &7PARTIAL&8 - &7Vanilla with clusters of plots");
                     return false;
                 }
                 object.type = types.indexOf(args[0].toLowerCase());
                 if (object.type == 0) {
                     object.current++;
                     if (object.step == null) {
-                        object.step = generators.get(object.generator).getNewPlotWorld(null).getSettingNodes();
+                        object.step = SetupUtils.generators.get(object.generator).getNewPlotWorld(null).getSettingNodes();
                     }
-                    ConfigurationNode step = object.step[object.setup_index];
+                    final ConfigurationNode step = object.step[object.setup_index];
                     sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
-                }
+                } else {
-                else {
+                    MainUtil.sendMessage(plr, "&6What terrain would you like in plots?" + "\n&8 - &2NONE&8 - &7No terrain at all" + "\n&8 - &7ORE&8 - &7Just some ore veins and trees" + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
-                    PlayerFunctions.sendMessage(plr, "&6What terrain would you like in plots?"
-                    + "\n&8 - &2NONE&8 - &7No terrain at all"
-                    + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
-                    + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
                 }
                 object.current++;
                 break;
             }
             case 2: { // Choose terrain
-                List<String> terrain = Arrays.asList(new String[] {"none", "ore", "all"});
+                final List<String> terrain = Arrays.asList(new String[] { "none", "ore", "all" });
-                if (args.length != 1 || !terrain.contains(args[0].toLowerCase())) {
+                if ((args.length != 1) || !terrain.contains(args[0].toLowerCase())) {
-                    PlayerFunctions.sendMessage(plr, "&cYou must choose the terrain!"
+                    MainUtil.sendMessage(plr, "&cYou must choose the terrain!" + "\n&8 - &2NONE&8 - &7No terrain at all" + "\n&8 - &7ORE&8 - &7Just some ore veins and trees" + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
-                    + "\n&8 - &2NONE&8 - &7No terrain at all"
-                    + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
-                    + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
                     return false;
                 }
                 object.terrain = terrain.indexOf(args[0].toLowerCase());
                 object.current++;
                 if (object.step == null) {
-                    object.step = generators.get(object.generator).getNewPlotWorld(null).getSettingNodes();
+                    object.step = SetupUtils.generators.get(object.generator).getNewPlotWorld(null).getSettingNodes();
                 }
-                ConfigurationNode step = object.step[object.setup_index];
+                final ConfigurationNode step = object.step[object.setup_index];
                 sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                 break;
             }
             case 3: { // world setup
                 if (object.setup_index == object.step.length) {
-                    PlayerFunctions.sendMessage(plr, "&6What do you want your world to be called?");
+                    MainUtil.sendMessage(plr, "&6What do you want your world to be called?");
                     object.setup_index = 0;
                     object.current++;
                     return true;
@@ -221,121 +157,27 @@ public class Setup extends SubCommand {
             }
             case 4: {
                 if (args.length != 1) {
-                    PlayerFunctions.sendMessage(plr, "&cYou need to choose a world name!");
+                    MainUtil.sendMessage(plr, "&cYou need to choose a world name!");
                     return false;
                 }
-                if (Bukkit.getWorld(args[0]) != null) {
+                if (BlockManager.manager.isWorld(args[0])) {
-                    PlayerFunctions.sendMessage(plr, "&cThat world name is already taken!");
+                    MainUtil.sendMessage(plr, "&cThat world name is already taken!");
                 }
                 object.world = args[0];
-                setupMap.remove(plr.getName());
+                SetupUtils.setupMap.remove(plr.getName());
-                World world = setupWorld(object);
+                final String world = SetupUtils.manager.setupWorld(object);
                 try {
-                    plr.teleport(world.getSpawnLocation());
+                    plr.teleport(BlockManager.manager.getSpawn(world));
-                }
+                } catch (final Exception e) {
-                catch (Exception e) {
                     plr.sendMessage("&cAn error occured. See console for more information");
                     e.printStackTrace();
                 }
                 sendMessage(plr, C.SETUP_FINISHED, object.world);
-                setupMap.remove(plr.getName());
+                SetupUtils.setupMap.remove(plr.getName());
             }
         }
-        /*
-         * 0.0 normal hybrid no clusters
-         * 0.1 normal hybrid with clusters
-         * 0.2 normal hybrid require clusters
-         * 1.0 augmented whole world
-         * 1.1 augmented whole world with ore
-         * 1.2 augmented whole world with terrain
-         * 2.1 augmented partial world
-         * 2.2 augmented partial world with ore
-         * 2.3 augmented partial world with terrain
-         * 3.0 no generation + normal manager
-         * 
-         * generator.TYPE: PlotSquared, augmented, partial
-         * generator.TERRAIN
-         * 
-         * WORLD.TYPE: hybrid, augmented, partial
-         * if (augmented/partial)
-         * WORLD.TERRAIN: 
-         * 
-         * 
-         * types (0, 1, 2, 3)
-         * 0: no options
-         * 1: 
-         * 
-         *  
-         *  - return null
-         *  - schedule task to create world later
-         *  - externalize multiverse/world hooks to separate class
-         *  - create vanilla world
-         *  - add augmented populator
-         *  - add config option type
-         *  - Work on heirarchy for setting nodes so you don't need to provide irrelevent info (world setup)
-         *  - use code from setup command for world arguments (above) so that it persists
-         *  - work on plot clearing for augmented plot worlds (terrain) (heads, banners, paintings, animals, inventoryhandler)
-         *  - make a generic clear function for any generator
-         *  - clean up plotmanager class (remove unnecessary methods)
-         *  - make simple plot manager which can be used by external generators (don't make abstract)
-         *  - plugins will override any of it's methods
-         *  - make heirarchy of generators of increasing abstraction:
-         *    = totally abstract (circle plots, moving plots, no tesselation)
-         *    = tessellating generator
-         *    = grid generator
-         *    = square generator
-         *    = square plot generator (must have plot section and road section) (plot height, road height)
-         *    = hybrid generator
-         *    
-         *  - All will support whole world augmentation
-         *  - Only grid will support partial plot worlds
-         * 
-         */
         return false;
     }
     
-    public World setupWorld(SetupObject object) {
+    
-        // Configuration
-        final ConfigurationNode[] steps = object.step;
-        final String world = object.world;
-        for (final ConfigurationNode step : steps) {
-            PlotMain.config.set("worlds." + world + "." + step.getConstant(), step.getValue());
-        }
-        if (object.type != 0) {
-            PlotMain.config.set("worlds." + world + "." + "generator.type", object.type);
-            PlotMain.config.set("worlds." + world + "." + "generator.terrain", object.terrain);
-            PlotMain.config.set("worlds." + world + "." + "generator.plugin", object.generator);
-        }
-        try {
-            PlotMain.config.save(PlotMain.configFile);
-        } catch (final IOException e) {
-            e.printStackTrace();
-        }
-        if (object.type == 0) {
-            if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
-                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv create " + world + " normal -g " + object.generator);
-            } else {
-                if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
-                    Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + world + " plugin:" + object.generator);
-                } else {
-                    WorldCreator wc = new WorldCreator(object.world);
-                    wc.generator(object.generator);
-                    wc.environment(Environment.NORMAL);
-                    World newWorld = Bukkit.createWorld(wc);
-                }
-            }
-        }
-        else {
-            if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
-                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv create " + world + " normal");
-            } else {
-                if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
-                    Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + world);
-                } else {
-                    Bukkit.createWorld(new WorldCreator(object.world).environment(World.Environment.NORMAL));
-                }
-            }
-        }
-        return Bukkit.getWorld(object.world);
-    }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java

@@ -18,24 +18,22 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 /**
  * SubCommand class
  *
  * @author Citymonstret
  */
-@SuppressWarnings({"deprecation", "unused"}) public abstract class SubCommand {
+@SuppressWarnings({ "deprecation", "unused" })
-
+public abstract class SubCommand {
     /**
      * Command
      */
@@ -128,7 +126,7 @@ import com.intellectualcrafters.plot.util.PlayerFunctions;
      *
      * @return true on success, false on failure
      */
-    public abstract boolean execute(final Player plr, final String... args);
+    public abstract boolean execute(final PlotPlayer plr, final String... args);
     
     /**
      * Execute the command as console
@@ -146,11 +144,11 @@ import com.intellectualcrafters.plot.util.PlayerFunctions;
      * @param c    Caption
      * @param args Arguments (%s's)
      *
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions#sendMessage(org.bukkit.entity.Player,
+     * @see com.intellectualcrafters.plot.util.bukkit.BukkitPlayerFunctions#sendMessage(org.bukkit.entity.Player,
      * com.intellectualcrafters.plot.config.C, String...)
      */
-    public boolean sendMessage(final Player plr, final C c, final String... args) {
+    public boolean sendMessage(final PlotPlayer plr, final C c, final String... args) {
-        PlayerFunctions.sendMessage(plr, c, args);
+        MainUtil.sendMessage(plr, c, args);
         return true;
     }
     
@@ -191,7 +189,6 @@ import com.intellectualcrafters.plot.util.PlayerFunctions;
          * Such as: /plot debug
          */
         DEBUG("Debug");
-
         /**
          * The category name (Readable)
          */

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Swap.java

@@ -18,21 +18,19 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.World;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotSelection;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.AChunkManager;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * Created 2014-08-01 for PlotSquared
@@ -40,60 +38,56 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
  * @author Empire92
  */
 public class Swap extends SubCommand {
-
     public Swap() {
         super(Command.SWAP, "Swap two plots", "switch", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 1) {
-            PlayerFunctions.sendMessage(plr, C.NEED_PLOT_ID);
+            MainUtil.sendMessage(plr, C.NEED_PLOT_ID);
-            PlayerFunctions.sendMessage(plr, C.SWAP_SYNTAX);
+            MainUtil.sendMessage(plr, C.SWAP_SYNTAX);
             return false;
         }
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
-            return false;
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
+        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.swap")) {
-        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !PlotMain.hasPermission(plr, "plots.admin.command.swap")) {
+            MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
         if ((plot != null) && plot.settings.isMerged()) {
-            PlayerFunctions.sendMessage(plr, C.UNLINK_REQUIRED);
+            MainUtil.sendMessage(plr, C.UNLINK_REQUIRED);
             return false;
         }
         final String id = args[0];
         PlotId plotid;
-        final World world = plr.getWorld();
+        final String world = loc.getWorld();
         try {
             plotid = new PlotId(Integer.parseInt(id.split(";")[0]), Integer.parseInt(id.split(";")[1]));
-            final Plot plot2 = PlotMain.getPlots(world).get(plotid);
+            final Plot plot2 = PlotSquared.getPlots(world).get(plotid);
-            if (((plot2 == null) || !plot2.hasOwner() || (plot2.owner != UUIDHandler.getUUID(plr))) && !PlotMain.hasPermission(plr, "plots.admin.command.swap")) {
+            if (((plot2 == null) || !plot2.hasOwner() || (plot2.owner != UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.swap")) {
-                PlayerFunctions.sendMessage(plr, C.NO_PERM_MERGE, plotid.toString());
+                MainUtil.sendMessage(plr, C.NO_PERM_MERGE, plotid.toString());
                 return false;
             }
         } catch (final Exception e) {
-            PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
+            MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
-            PlayerFunctions.sendMessage(plr, C.SWAP_SYNTAX);
+            MainUtil.sendMessage(plr, C.SWAP_SYNTAX);
             return false;
         }
         assert plot != null;
         if (plot.id.equals(plotid)) {
-            PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
+            MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
-            PlayerFunctions.sendMessage(plr, C.SWAP_SYNTAX);
+            MainUtil.sendMessage(plr, C.SWAP_SYNTAX);
             return false;
         }
-        PlotSelection.swap(world, plot.id, plotid);
+        AChunkManager.manager.swap(world, plot.id, plotid);
-
+        // FIXME Requires testing!!
-        // TODO Requires testing!!
+        DBFunc.dbManager.swapPlots(plot, MainUtil.getPlot(world, plotid));
-        DBFunc.dbManager.swapPlots(plot, PlotHelper.getPlot(world, plotid));
+        MainUtil.sendMessage(plr, C.SWAP_SUCCESS);
-        // TODO Requires testing!!
+        MainUtil.update(plr.getLocation());
-
-        PlayerFunctions.sendMessage(plr, C.SWAP_SUCCESS);
-        PlotHelper.update(plr.getLocation());
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java

@@ -18,65 +18,64 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * @author Citymonstret
  */
 public class TP extends SubCommand {
-
     public TP() {
         super(Command.TP, "Teleport to a plot", "tp {alias|id}", CommandCategory.TELEPORT, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 1) {
-            PlayerFunctions.sendMessage(plr, C.NEED_PLOT_ID);
+            MainUtil.sendMessage(plr, C.NEED_PLOT_ID);
             return false;
         }
         final String id = args[0];
         PlotId plotid;
-        World world = plr.getWorld();
+        Location loc = plr.getLocation();
+        String pworld = loc.getWorld();
+        String world = pworld;
         if (args.length == 2) {
-            if (Bukkit.getWorld(args[1]) != null) {
+            if (BlockManager.manager.isWorld(args[1])) {
-                world = Bukkit.getWorld(args[1]);
+                world = args[1];
             }
         }
-        if (!PlotMain.isPlotWorld(world)) {
+        if (!PlotSquared.isPlotWorld(world)) {
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
+            MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
             return false;
         }
         Plot temp;
         if ((temp = isAlias(world, id)) != null) {
-            PlotMain.teleportPlayer(plr, plr.getLocation(), temp);
+            MainUtil.teleportPlayer(plr, plr.getLocation(), temp);
             return true;
         }
-
         try {
             plotid = new PlotId(Integer.parseInt(id.split(";")[0]), Integer.parseInt(id.split(";")[1]));
-            PlotMain.teleportPlayer(plr, plr.getLocation(), PlotHelper.getPlot(world, plotid));
+            MainUtil.teleportPlayer(plr, plr.getLocation(), MainUtil.getPlot(world, plotid));
             return true;
         } catch (final Exception e) {
-            PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
+            MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
         }
         return false;
     }
     
-    private Plot isAlias(final World world, String a) {
+    private Plot isAlias(final String world, String a) {
         int index = 0;
         if (a.contains(";")) {
             final String[] split = a.split(";");
@@ -85,16 +84,16 @@ public class TP extends SubCommand {
             }
             a = split[0];
         }
-        @SuppressWarnings("deprecation") final Player player = Bukkit.getPlayer(a);
+        final PlotPlayer player = UUIDHandler.getPlayer(a);
         if (player != null) {
-            final java.util.Set<Plot> plotMainPlots = PlotMain.getPlots(world, player);
+            final java.util.Set<Plot> plotMainPlots = PlotSquared.getPlots(world, player);
             final Plot[] plots = plotMainPlots.toArray(new Plot[plotMainPlots.size()]);
             if (plots.length > index) {
                 return plots[index];
             }
             return null;
         }
-        for (final Plot p : PlotMain.getPlots(world).values()) {
+        for (final Plot p : PlotSquared.getPlots(world).values()) {
             if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) {
                 return p;
             }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Target.java

@@ -18,42 +18,39 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.Location;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 public class Target extends SubCommand {
-
     public Target() {
         super(Command.TARGET, "Target a plot with your compass", "target <X;Z>", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlotMain.isPlotWorld(plr.getWorld())) {
+        Location ploc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
+        if (!PlotSquared.isPlotWorld(ploc.getWorld())) {
+            MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
             return false;
         }
         if (args.length == 1) {
-            PlotId id = PlotHelper.parseId(args[1]);
+            final PlotId id = MainUtil.parseId(args[1]);
             if (id == null) {
-                PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
+                MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
                 return false;
             }
-            Location loc = PlotHelper.getPlotHome(plr.getWorld(), id);
+            final Location loc = MainUtil.getPlotHome(ploc.getWorld(), id);
             plr.setCompassTarget(loc);
-            PlayerFunctions.sendMessage(plr, C.COMPASS_TARGET);
+            MainUtil.sendMessage(plr, C.COMPASS_TARGET);
             return true;
         }
-        PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot target <X;Z>");
+        MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot target <X;Z>");
         return false;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Template.java

@@ -18,31 +18,66 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.zip.GZIPOutputStream;
 
+import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.MainUtil;
 
 public class Template extends SubCommand {
-
     public Template() {
         super("template", "plots.admin", "Create or use a world template", "template", "", CommandCategory.DEBUG, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length != 2) {
-            PlayerFunctions.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template <import|export> <world>");
+            MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template <import|export> <world>");
             return false;
         }
-        
+        String world = args[1];
-        // TODO allow world settings (including schematics to be packed into a single file)
+        final PlotWorld plotworld = PlotSquared.getPlotWorld(world);
-        
+        if (!BlockManager.manager.isWorld(world) || (plotworld == null)) {
-        // TODO allow world created based on these packaged files
+            MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD);
-        
+            return false;
+        }
+        switch (args[0].toLowerCase()) {
+            case "import": {
+                // TODO import template
+                MainUtil.sendMessage(plr, "TODO");
                 return true;
             }
+            case "export": {
+                MainUtil.sendMessage(plr, "TODO");
+            }
+        }
+        // TODO allow world settings (including schematics to be packed into a single file)
+        // TODO allow world created based on these packaged files
+        return true;
+    }
+    
+    public void gzipIt(final String output, final String input) {
+        final byte[] buffer = new byte[1024];
+        try {
+            final GZIPOutputStream gzos = new GZIPOutputStream(new FileOutputStream(output));
+            final FileInputStream in = new FileInputStream(input);
+            int len;
+            while ((len = in.read(buffer)) > 0) {
+                gzos.write(buffer, 0, len);
+            }
+            in.close();
+            gzos.finish();
+            gzos.close();
+        } catch (final IOException ex) {
+            ex.printStackTrace();
+        }
+    }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java

@@ -18,7 +18,6 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.io.File;
@@ -28,28 +27,21 @@ import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.Set;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.generator.SquarePlotManager;
-import com.intellectualcrafters.plot.generator.SquarePlotWorld;
 import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.ChunkManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.ExpireManager;
+import com.intellectualcrafters.plot.util.AChunkManager;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.BlockManager;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.bukkit.ChunkManager;
 
 public class Trim extends SubCommand {
-
     public static boolean TASK = false;
     private static int TASK_ID = 0;
     
@@ -57,56 +49,53 @@ public class Trim extends SubCommand {
         super("trim", "plots.admin", "Delete unmodified portions of your plotworld", "trim", "", CommandCategory.DEBUG, false);
     }
     
-    public PlotId getId(String id) {
+    public PlotId getId(final String id) {
         try {
-            String[] split = id.split(";");
+            final String[] split = id.split(";");
             return new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-        }
+        } catch (final Exception e) {
-        catch (Exception e) {
             return null;
         }
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (plr != null) {
-            PlayerFunctions.sendMessage(plr, (C.NOT_CONSOLE));
+            MainUtil.sendMessage(plr, (C.NOT_CONSOLE));
             return false;
         }
         if (args.length == 1) {
-            String arg = args[0].toLowerCase();
+            final String arg = args[0].toLowerCase();
-            PlotId id = getId(arg);
+            final PlotId id = getId(arg);
             if (id != null) {
-                PlayerFunctions.sendMessage(plr, "/plot trim x;z &l<world>");
+                MainUtil.sendMessage(plr, "/plot trim x;z &l<world>");
                 return false;
             }
             if (arg.equals("all")) {
-                PlayerFunctions.sendMessage(plr, "/plot trim all &l<world>");
+                MainUtil.sendMessage(plr, "/plot trim all &l<world>");
                 return false;
             }
-            PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX);
+            MainUtil.sendMessage(plr, C.TRIM_SYNTAX);
             return false;
         }
         if (args.length != 2) {
-            PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX);
+            MainUtil.sendMessage(plr, C.TRIM_SYNTAX);
             return false;
         }
-        String arg = args[0].toLowerCase();
+        final String arg = args[0].toLowerCase();
         if (!arg.equals("all")) {
-            PlayerFunctions.sendMessage(plr, C.TRIM_SYNTAX);
+            MainUtil.sendMessage(plr, C.TRIM_SYNTAX);
             return false;
         }
-        final World world = Bukkit.getWorld(args[1]);
+        final String world = args[1];
-        if (world == null || PlotMain.getWorldSettings(world) == null) {
+        if (!BlockManager.manager.isWorld(world) || (PlotSquared.getPlotWorld(world) == null)) {
-            PlayerFunctions.sendMessage(plr, C.NOT_VALID_WORLD);
+            MainUtil.sendMessage(plr, C.NOT_VALID_WORLD);
             return false;
         }
-        
         if (Trim.TASK) {
             sendMessage(C.TRIM_IN_PROGRESS.s());
             return false;
         }
-        
         sendMessage(C.TRIM_START.s());
         final ArrayList<ChunkLoc> empty = new ArrayList<>();
         getTrimRegions(empty, world, new Runnable() {
@@ -118,52 +107,48 @@ public class Trim extends SubCommand {
         return true;
     }
     
-    public static boolean getBulkRegions(final ArrayList<ChunkLoc> empty, final World world, final Runnable whenDone) {
+    public static boolean getBulkRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) {
         if (Trim.TASK) {
             return false;
         }
         TaskManager.runTaskAsync(new Runnable() {
             @Override
             public void run() {
-                String directory = world.getName() + File.separator + "region";
+                final String directory = world + File.separator + "region";
-                File folder = new File(directory);
+                final File folder = new File(directory);
-                File[] regionFiles = folder.listFiles();
+                final File[] regionFiles = folder.listFiles();
-                for (File file : regionFiles) {
+                for (final File file : regionFiles) {
-                    String name = file.getName();
+                    final String name = file.getName();
                     if (name.endsWith("mca")) {
                         if (file.getTotalSpace() <= 8192) {
                             try {
-                                String[] split = name.split("\\.");
+                                final String[] split = name.split("\\.");
-                                int x = Integer.parseInt(split[1]);
+                                final int x = Integer.parseInt(split[1]);
-                                int z = Integer.parseInt(split[2]);
+                                final int z = Integer.parseInt(split[2]);
-                                ChunkLoc loc = new ChunkLoc(x, z);
+                                final ChunkLoc loc = new ChunkLoc(x, z);
                                 empty.add(loc);
-                            }
+                            } catch (final Exception e) {
-                            catch (Exception e) {
                                 System.out.print("INVALID MCA: " + name);
                             }
-                        }
+                        } else {
-                        else {
+                            final Path path = Paths.get(file.getPath());
-                            Path path = Paths.get(file.getPath());
                             try {
-                                BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
+                                final BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
-                                long creation = attr.creationTime().toMillis();
+                                final long creation = attr.creationTime().toMillis();
-                                long modification = file.lastModified();
+                                final long modification = file.lastModified();
-                                long diff = Math.abs(creation - modification);
+                                final long diff = Math.abs(creation - modification);
                                 if (diff < 10000) {
                                     try {
-                                        String[] split = name.split("\\.");
+                                        final String[] split = name.split("\\.");
-                                        int x = Integer.parseInt(split[1]);
+                                        final int x = Integer.parseInt(split[1]);
-                                        int z = Integer.parseInt(split[2]);
+                                        final int z = Integer.parseInt(split[2]);
-                                        ChunkLoc loc = new ChunkLoc(x, z);
+                                        final ChunkLoc loc = new ChunkLoc(x, z);
                                         empty.add(loc);
-                                    }
+                                    } catch (final Exception e) {
-                                    catch (Exception e) {
                                         System.out.print("INVALID MCA: " + name);
                                     }
                                 }
-                            } catch (Exception e) {
+                            } catch (final Exception e) {
-                                
                             }
                         }
                     }
@@ -176,91 +161,57 @@ public class Trim extends SubCommand {
         return true;
     }
     
-    public static boolean getTrimRegions(final ArrayList<ChunkLoc> empty, final World world, final Runnable whenDone) {
+    public static boolean getTrimRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) {
         if (Trim.TASK) {
             return false;
         }
         final long startOld = System.currentTimeMillis();
         sendMessage("Collecting region data...");
         final ArrayList<Plot> plots = new ArrayList<>();
-        plots.addAll(PlotMain.getPlots(world).values());
+        plots.addAll(PlotSquared.getPlots(world).values());
-        final HashSet<ChunkLoc> chunks = new HashSet<>(ChunkManager.getChunkChunks(world));
+        final HashSet<ChunkLoc> chunks = new HashSet<>(AChunkManager.manager.getChunkChunks(world));
         sendMessage(" - MCA #: " + chunks.size());
-        sendMessage(" - CHUNKS: " + (chunks.size() * 1024) +" (max)");
+        sendMessage(" - CHUNKS: " + (chunks.size() * 1024) + " (max)");
-        sendMessage(" - TIME ESTIMATE: " + (chunks.size()/1200) +" minutes");
+        sendMessage(" - TIME ESTIMATE: " + (chunks.size() / 1200) + " minutes");
-        Trim.TASK_ID = Bukkit.getScheduler().scheduleSyncRepeatingTask(PlotMain.getMain(), new Runnable() {
+        Trim.TASK_ID = TaskManager.runTaskRepeat(new Runnable() {
             @Override
             public void run() {
-                long start = System.currentTimeMillis();
+                final long start = System.currentTimeMillis();
-                while (System.currentTimeMillis() - start < 50) {
+                while ((System.currentTimeMillis() - start) < 50) {
                     if (plots.size() == 0) {
                         empty.addAll(chunks);
                         System.out.print("DONE!");
                         Trim.TASK = false;
                         TaskManager.runTaskAsync(whenDone);
-                        Bukkit.getScheduler().cancelTask(Trim.TASK_ID);
+                        PlotSquared.TASK.cancelTask(Trim.TASK_ID);
                         return;
                     }
-                    Plot plot = plots.get(0);
+                    final Plot plot = plots.get(0);
                     plots.remove(0);
-                    Location pos1 = PlotHelper.getPlotBottomLoc(world, plot.id);
+                    final Location pos1 = MainUtil.getPlotBottomLoc(world, plot.id);
-                    Location pos2 = PlotHelper.getPlotTopLoc(world, plot.id);
+                    final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id);
-                    
+                    final Location pos3 = new Location(world, pos1.getX(), 64, pos2.getZ());
-                    Location pos3 = new Location(world, pos1.getBlockX(), 64, pos2.getBlockZ());
+                    final Location pos4 = new Location(world, pos2.getX(), 64, pos1.getZ());
-                    Location pos4 = new Location(world, pos2.getBlockX(), 64, pos1.getBlockZ());
-                    
                     chunks.remove(ChunkManager.getChunkChunk(pos1));
                     chunks.remove(ChunkManager.getChunkChunk(pos2));
                     chunks.remove(ChunkManager.getChunkChunk(pos3));
                     chunks.remove(ChunkManager.getChunkChunk(pos4));
                 }
             }
-        }, 20L, 20L);
+        }, 20);
         Trim.TASK = true;
         return true;
     }
     
     public static ArrayList<Plot> expired = null;
     
-//    public static void updateUnmodifiedPlots(final World world) {
+    public static void deleteChunks(final String world, final ArrayList<ChunkLoc> chunks) {
-//        final SquarePlotManager manager = (SquarePlotManager) PlotMain.getPlotManager(world);
+        for (final ChunkLoc loc : chunks) {
-//        final SquarePlotWorld plotworld = (SquarePlotWorld) PlotMain.getWorldSettings(world);
+            AChunkManager.manager.deleteRegionFile(world, loc);
-//        final ArrayList<Plot> expired = new ArrayList<>();
-//        final Set<Plot> plots = ExpireManager.getOldPlots(world.getName()).keySet();
-//        sendMessage("Checking " + plots.size() +" plots! This may take a long time...");
-//        Trim.TASK_ID = Bukkit.getScheduler().scheduleSyncRepeatingTask(PlotMain.getMain(), new Runnable() {
-//            @Override
-//            public void run() {
-//                if (manager != null && plots.size() > 0) {
-//                    Plot plot = plots.iterator().next();
-//                    if (plot.hasOwner()) {
-//                        SquarePlotManager.checkModified(plot, 0);
-//                    }
-//                    if (plot.owner == null || !SquarePlotManager.checkModified(plot, plotworld.REQUIRED_CHANGES)) {
-//                        expired.add(plot);
-//                        sendMessage("found expired: " + plot);
-//                    }
-//                }
-//                else {
-//                    Trim.expired = expired;
-//                    Trim.TASK = false;
-//                    sendMessage("Done!");
-//                    Bukkit.getScheduler().cancelTask(Trim.TASK_ID);
-//                    return;
-//                }
-//            }
-//        }, 1, 1);
-//    }
-//    
-    public static void deleteChunks(World world, ArrayList<ChunkLoc> chunks) {
-        String worldname = world.getName();
-        for (ChunkLoc loc : chunks) {
-            ChunkManager.deleteRegionFile(worldname, loc);
         }
     }
     
     public static void sendMessage(final String message) {
-        PlotMain.sendConsoleSenderMessage("&3PlotSquared -> World trim&8: &7" + message);
+        PlotSquared.log("&3PlotSquared -> World trim&8: &7" + message);
     }
-    
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java

@@ -18,102 +18,96 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.events.PlayerPlotTrustedEvent;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.MainUtil;
-
+import com.intellectualcrafters.plot.util.Permissions;
-@SuppressWarnings("deprecation") public class Trusted extends SubCommand {
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
+@SuppressWarnings("deprecation")
+public class Trusted extends SubCommand {
     public Trusted() {
         super(Command.TRUSTED, "Manage trusted users for a plot", "trusted {add|remove} {player}", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 2) {
-            PlayerFunctions.sendMessage(plr, C.TRUSTED_NEED_ARGUMENT);
+            MainUtil.sendMessage(plr, C.TRUSTED_NEED_ARGUMENT);
             return true;
         }
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
-            return true;
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
         if ((plot == null) || !plot.hasOwner()) {
-            PlayerFunctions.sendMessage(plr, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !PlotMain.hasPermission(plr, "plots.admin.command.trusted")) {
+        if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !Permissions.hasPermission(plr, "plots.admin.command.trusted")) {
-            PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
+            MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         if (args[0].equalsIgnoreCase("add")) {
             UUID uuid;
             if (args[1].equalsIgnoreCase("*")) {
                 uuid = DBFunc.everyone;
-
             } else {
                 uuid = UUIDHandler.getUUID(args[1]);
             }
             if (uuid == null) {
-                PlayerFunctions.sendMessage(plr, C.INVALID_PLAYER, args[1]);
+                MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]);
                 return false;
             }
             if (!plot.trusted.contains(uuid)) {
                 if (plot.owner.equals(uuid)) {
-                    PlayerFunctions.sendMessage(plr, C.ALREADY_OWNER);
+                    MainUtil.sendMessage(plr, C.ALREADY_OWNER);
                     return false;
                 }
                 if (plot.helpers.contains(uuid)) {
                     plot.helpers.remove(uuid);
-                    DBFunc.removeHelper(plr.getWorld().getName(), plot, uuid);
+                    DBFunc.removeHelper(loc.getWorld(), plot, uuid);
                 }
                 if (plot.denied.contains(uuid)) {
                     plot.denied.remove(uuid);
-                    DBFunc.removeDenied(plr.getWorld().getName(), plot, uuid);
+                    DBFunc.removeDenied(loc.getWorld(), plot, uuid);
                 }
                 plot.addTrusted(uuid);
-                DBFunc.setTrusted(plr.getWorld().getName(), plot, uuid);
+                DBFunc.setTrusted(loc.getWorld(), plot, uuid);
-                final PlayerPlotTrustedEvent event = new PlayerPlotTrustedEvent(plr, plot, uuid, true);
+                // FIXME PlayerPlotTrustedEvent
-                Bukkit.getPluginManager().callEvent(event);
             } else {
-                PlayerFunctions.sendMessage(plr, C.ALREADY_ADDED);
+                MainUtil.sendMessage(plr, C.ALREADY_ADDED);
                 return false;
             }
-            PlayerFunctions.sendMessage(plr, C.TRUSTED_ADDED);
+            MainUtil.sendMessage(plr, C.TRUSTED_ADDED);
             return true;
         } else if (args[0].equalsIgnoreCase("remove")) {
             if (args[1].equalsIgnoreCase("*")) {
                 final UUID uuid = DBFunc.everyone;
                 if (!plot.trusted.contains(uuid)) {
-                    PlayerFunctions.sendMessage(plr, C.T_WAS_NOT_ADDED);
+                    MainUtil.sendMessage(plr, C.T_WAS_NOT_ADDED);
                     return true;
                 }
                 plot.removeTrusted(uuid);
-                DBFunc.removeTrusted(plr.getWorld().getName(), plot, uuid);
+                DBFunc.removeTrusted(loc.getWorld(), plot, uuid);
-                PlayerFunctions.sendMessage(plr, C.TRUSTED_REMOVED);
+                MainUtil.sendMessage(plr, C.TRUSTED_REMOVED);
                 return true;
             }
             final UUID uuid = UUIDHandler.getUUID(args[1]);
             plot.removeTrusted(uuid);
-            DBFunc.removeTrusted(plr.getWorld().getName(), plot, uuid);
+            DBFunc.removeTrusted(loc.getWorld(), plot, uuid);
-            final PlayerPlotTrustedEvent event = new PlayerPlotTrustedEvent(plr, plot, uuid, false);
+            // FIXME PlayerPlotTrustedEvent
-            Bukkit.getPluginManager().callEvent(event);
+            MainUtil.sendMessage(plr, C.TRUSTED_REMOVED);
-            PlayerFunctions.sendMessage(plr, C.TRUSTED_REMOVED);
         } else {
-            PlayerFunctions.sendMessage(plr, C.TRUSTED_NEED_ARGUMENT);
+            MainUtil.sendMessage(plr, C.TRUSTED_NEED_ARGUMENT);
             return true;
         }
         return true;

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unban.java

@@ -1,34 +0,0 @@
-package com.intellectualcrafters.plot.commands;
-
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-
-/**
- * Created 2014-11-09 for PlotSquared
- *
- * @author Citymonstret
- */
-public class Unban extends SubCommand {
-
-    public Unban() {
-        super(Command.UNBAN, "Alias for /plot denied remove", "/plot unban [player]", CommandCategory.ACTIONS, true);
-    }
-
-    @Override
-    public boolean execute(final Player plr, final String... args) {
-        if (args.length < 1) {
-            return PlayerFunctions.sendMessage(plr, "&cUsage: &c" + this.usage);
-        }
-        if (!PlayerFunctions.isInPlot(plr)) {
-            return sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if (!plot.hasRights(plr)) {
-            return sendMessage(plr, C.NO_PLOT_PERMS);
-        }
-        return plr.performCommand("plot denied remove " + args[0]);
-    }
-}

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java

@@ -18,61 +18,60 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import net.milkbowl.vault.economy.Economy;
 
-import org.bukkit.World;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.EconHandler;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class Unclaim extends SubCommand {
-
     public Unclaim() {
         super(Command.UNCLAIM, "Unclaim a plot", "unclaim", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) {
             return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
+        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
-        if (!PlayerFunctions.getTopPlot(plr.getWorld(), plot).equals(PlayerFunctions.getBottomPlot(plr.getWorld(), plot))) {
             return !sendMessage(plr, C.UNLINK_REQUIRED);
         }
-        if ((((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr)))) && !PlotMain.hasPermission(plr, "plots.admin.command.unclaim")) {
+        if ((((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr)))) && !Permissions.hasPermission(plr, "plots.admin.command.unclaim")) {
             return !sendMessage(plr, C.NO_PLOT_PERMS);
         }
         assert plot != null;
-        final PlotWorld pWorld = PlotMain.getWorldSettings(plot.getWorld());
+        final PlotWorld pWorld = PlotSquared.getPlotWorld(plot.world);
-        if (PlotMain.useEconomy && pWorld.USE_ECONOMY) {
+        if (PlotSquared.economy != null && pWorld.USE_ECONOMY) {
             final double c = pWorld.SELL_PRICE;
             if (c > 0d) {
-                final Economy economy = PlotMain.economy;
+                final Economy economy = PlotSquared.economy;
-                economy.depositPlayer(plr, c);
+                EconHandler.depositPlayer(plr, c);
                 sendMessage(plr, C.ADDED_BALANCE, c + "");
             }
         }
-        final boolean result = PlotMain.removePlot(plr.getWorld().getName(), plot.id, true);
+        final boolean result = PlotSquared.removePlot(loc.getWorld(), plot.id, true);
         if (result) {
-            World world = plr.getWorld();
+            final String worldname = plr.getLocation().getWorld();
-            String worldname = world.getName();
+            PlotSquared.getPlotManager(worldname).unclaimPlot(pWorld, plot);
-            PlotMain.getPlotManager(world).unclaimPlot(world, pWorld, plot);
             DBFunc.delete(worldname, plot);
             // TODO set wall block
         } else {
-            PlayerFunctions.sendMessage(plr, "Plot removal has been denied.");
+            MainUtil.sendMessage(plr, "Plot removal has been denied.");
         }
-        PlayerFunctions.sendMessage(plr, C.UNCLAIM_SUCCESS);
+        MainUtil.sendMessage(plr, C.UNCLAIM_SUCCESS);
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java

@@ -18,26 +18,22 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 
-import org.bukkit.Bukkit;
+import com.intellectualcrafters.plot.PlotSquared;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.events.PlotUnlinkEvent;
+import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 /**
  * Created 2014-08-01 for PlotSquared
@@ -45,68 +41,46 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
  * @author Citymonstret
  */
 public class Unlink extends SubCommand {
-
     public Unlink() {
         super(Command.UNLINK, "Unlink a mega-plot", "unlink", CommandCategory.ACTIONS, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (!PlayerFunctions.isInPlot(plr)) {
+        Location loc = plr.getLocation();
-            return sendMessage(plr, C.NOT_IN_PLOT);
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) {
+            return !sendMessage(plr, C.NOT_IN_PLOT);
         }
-        final Plot plot = PlayerFunctions.getCurrentPlot(plr);
+        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.unlink")) {
-        if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !PlotMain.hasPermission(plr, "plots.admin.command.unlink")) {
             return sendMessage(plr, C.NO_PLOT_PERMS);
         }
-        if (PlayerFunctions.getTopPlot(plr.getWorld(), plot).equals(PlayerFunctions.getBottomPlot(plr.getWorld(), plot))) {
+        if (MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
             return sendMessage(plr, C.UNLINK_IMPOSSIBLE);
         }
-
+        if (!unlinkPlot(plot)) {
-        final World world = plr.getWorld();
+            MainUtil.sendMessage(plr, "&cUnlink has been cancelled");
-        if (!unlinkPlot(world, plot)) {
-            PlayerFunctions.sendMessage(plr, "&cUnlink has been cancelled");
             return false;
         }
-        try {
+        MainUtil.update(plr.getLocation());
-            PlotHelper.update(plr.getLocation());
+        MainUtil.sendMessage(plr, "&6Plots unlinked successfully!");
-        } catch (final Exception e) {
-            // execute(final Player plr, final String... args) {
-            try {
-                PlotMain.sendConsoleSenderMessage("Error on: " + getClass().getMethod("execute", Player.class, String[].class).toGenericString() + ":119, when trying to use \"SetBlockFast#update\"");
-            } catch (final Exception ex) {
-                ex.printStackTrace();
-            }
-        }
-        PlayerFunctions.sendMessage(plr, "&6Plots unlinked successfully!");
         return true;
     }
     
-    public static boolean unlinkPlot(World world, Plot plot) {
+    public static boolean unlinkPlot(final Plot plot) {
-        final PlotId pos1 = PlayerFunctions.getBottomPlot(world, plot).id;
+        String world = plot.world;
-        final PlotId pos2 = PlayerFunctions.getTopPlot(world, plot).id;
+        final PlotId pos1 = MainUtil.getBottomPlot(plot).id;
-        final ArrayList<PlotId> ids = PlayerFunctions.getPlotSelectionIds(pos1, pos2);
+        final PlotId pos2 = MainUtil.getTopPlot(plot).id;
-
+        final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(pos1, pos2);
-        final PlotUnlinkEvent event = new PlotUnlinkEvent(world, ids);
+        // FIXME PlotUnlinkEvent (cancellable)
-
+        final PlotManager manager = PlotSquared.getPlotManager(world);
-        Bukkit.getServer().getPluginManager().callEvent(event);
+        final PlotWorld plotworld = PlotSquared.getPlotWorld(world);
-        if (event.isCancelled()) {
+        manager.startPlotUnlink(plotworld, ids);
-            event.setCancelled(true);
-            return false;
-        }
-
-        final PlotManager manager = PlotMain.getPlotManager(world);
-        final PlotWorld plotworld = PlotMain.getWorldSettings(world);
-
-        manager.startPlotUnlink(world, plotworld, ids);
-
         for (final PlotId id : ids) {
-            final Plot myplot = PlotMain.getPlots(world).get(id);
+            final Plot myplot = PlotSquared.getPlots(world).get(id);
-
             if (plot == null) {
                 continue;
             }
-
             if (plot.helpers != null) {
                 myplot.helpers = plot.helpers;
             }
@@ -114,38 +88,33 @@ public class Unlink extends SubCommand {
                 myplot.denied = plot.denied;
             }
             myplot.deny_entry = plot.deny_entry;
-            myplot.settings.setMerged(new boolean[]{false, false, false, false});
+            myplot.settings.setMerged(new boolean[] { false, false, false, false });
-            DBFunc.setMerged(world.getName(), myplot, myplot.settings.getMerged());
+            DBFunc.setMerged(world, myplot, myplot.settings.getMerged());
         }
-
         for (int x = pos1.x; x <= pos2.x; x++) {
             for (int y = pos1.y; y <= pos2.y; y++) {
                 final boolean lx = x < pos2.x;
                 final boolean ly = y < pos2.y;
-
+                final Plot p = MainUtil.getPlot(world, new PlotId(x, y));
-                final Plot p = PlotHelper.getPlot(world, new PlotId(x, y));
-
                 if (lx) {
                     manager.createRoadEast(plotworld, p);
                     if (ly) {
                         manager.createRoadSouthEast(plotworld, p);
                     }
-
                 }
-
                 if (ly) {
                     manager.createRoadSouth(plotworld, p);
                 }
-                PlotHelper.setSign(world, UUIDHandler.getName(plot.owner), plot);
+                MainUtil.setSign(UUIDHandler.getName(plot.owner), plot);
             }
         }
-        manager.finishPlotUnlink(world, plotworld, ids);
+        manager.finishPlotUnlink(plotworld, ids);
-        for (PlotId id : ids) {
+        for (final PlotId id : ids) {
-            Plot myPlot = PlotHelper.getPlot(world, id);
+            final Plot myPlot = MainUtil.getPlot(world, id);
             if (plot.hasOwner()) {
-                String name = UUIDHandler.getName(myPlot.owner);
+                final String name = UUIDHandler.getName(myPlot.owner);
                 if (name != null) {
-                    PlotHelper.setSign(world, name, myPlot);
+                    MainUtil.setSign(name, myPlot);
                 }
             }
         }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java

@@ -18,19 +18,18 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.PlotSquared;
-
-import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class Visit extends SubCommand {
     public Visit() {
@@ -39,7 +38,7 @@ public class Visit extends SubCommand {
     
     public List<Plot> getPlots(final UUID uuid) {
         final List<Plot> plots = new ArrayList<>();
-        for (final Plot p : PlotMain.getPlots()) {
+        for (final Plot p : PlotSquared.getPlots()) {
             if (p.hasOwner() && p.owner.equals(uuid)) {
                 plots.add(p);
             }
@@ -48,7 +47,7 @@ public class Visit extends SubCommand {
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
         if (args.length < 1) {
             return sendMessage(plr, C.NEED_USER);
         }
@@ -62,7 +61,7 @@ public class Visit extends SubCommand {
             return sendMessage(plr, C.FOUND_NO_PLOTS);
         }
         if (args.length < 2) {
-            PlotMain.teleportPlayer(plr, plr.getLocation(), plots.get(0));
+            MainUtil.teleportPlayer(plr, plr.getLocation(), plots.get(0));
             return true;
         }
         int i;
@@ -74,7 +73,7 @@ public class Visit extends SubCommand {
         if ((i < 0) || (i >= plots.size())) {
             return sendMessage(plr, C.NOT_VALID_NUMBER);
         }
-        PlotMain.teleportPlayer(plr, plr.getLocation(), plots.get(i));
+        MainUtil.teleportPlayer(plr, plr.getLocation(), plots.get(i));
         return true;
     }
 }

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java

@@ -18,35 +18,31 @@
 //                                                                                                 /
 // You can contact us via: support@intellectualsites.com                                           /
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
+import com.intellectualcrafters.plot.PlotSquared;
-
+import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.PWE;
+import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.bukkit.PWE;
 
 public class WE_Anywhere extends SubCommand {
-
     public WE_Anywhere() {
         super("weanywhere", "plots.weanywhere", "Force bypass of WorldEdit", "weanywhere", "wea", CommandCategory.DEBUG, true);
     }
     
     @Override
-    public boolean execute(final Player plr, final String... args) {
+    public boolean execute(final PlotPlayer plr, final String... args) {
-        if (PlotMain.worldEdit == null) {
+        if (PlotSquared.worldEdit == null) {
-            PlayerFunctions.sendMessage(plr, "&cWorldEdit is not enabled on this server");
+            MainUtil.sendMessage(plr, "&cWorldEdit is not enabled on this server");
             return false;
         }
-        
+        if (Permissions.hasPermission(plr, "plots.worldedit.bypass") && PWE.hasMask(plr)) {
-        if (PlotMain.hasPermission(plr, "plots.worldedit.bypass") && PWE.hasMask(plr)) {
             PWE.removeMask(plr);
-            PlayerFunctions.sendMessage(plr, "&6Cleared your WorldEdit mask");
+            MainUtil.sendMessage(plr, "&6Cleared your WorldEdit mask");
-        }
+        } else {
-        else {
             PWE.setMask(plr, plr.getLocation(), true);
-            PlayerFunctions.sendMessage(plr, "&6Updated your WorldEdit mask");
+            MainUtil.sendMessage(plr, "&6Updated your WorldEdit mask");
         }
         return true;
     }