EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-01-19 16:59:36 +01:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
boy0001 2015-02-23 12:32:27 +11:00
parent 625d19b5d0
commit f2c9e4933a
210 changed files with 2119 additions and 2141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java
View File

@ -5,7 +5,7 @@ package com.intellectualcrafters.jnbt;
*/ */
public final class ByteArrayTag extends Tag { public final class ByteArrayTag extends Tag {
private final byte[] value; private final byte[] value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -15,7 +15,7 @@ public final class ByteArrayTag extends Tag {
super(); super();
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -26,12 +26,12 @@ public final class ByteArrayTag extends Tag {
super(name); super(name);
this.value = value; this.value = value;
} }
@Override @Override
public byte[] getValue() { public byte[] getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final StringBuilder hex = new StringBuilder(); final StringBuilder hex = new StringBuilder();

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java
View File

@ -5,7 +5,7 @@ package com.intellectualcrafters.jnbt;
*/ */
public final class ByteTag extends Tag { public final class ByteTag extends Tag {
private final byte value; private final byte value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -15,7 +15,7 @@ public final class ByteTag extends Tag {
super(); super();
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -26,12 +26,12 @@ public final class ByteTag extends Tag {
super(name); super(name);
this.value = value; this.value = value;
} }
@Override @Override
public Byte getValue() { public Byte getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

44
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java
View File

@ -10,7 +10,7 @@ import java.util.Map;
*/ */
public final class CompoundTag extends Tag { public final class CompoundTag extends Tag {
private final Map<String, Tag> value; private final Map<String, Tag> value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -20,7 +20,7 @@ public final class CompoundTag extends Tag {
super(); super();
this.value = Collections.unmodifiableMap(value); this.value = Collections.unmodifiableMap(value);
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -31,7 +31,7 @@ public final class CompoundTag extends Tag {
super(name); super(name);
this.value = Collections.unmodifiableMap(value); this.value = Collections.unmodifiableMap(value);
} }
/** /**
* Returns whether this compound tag contains the given key. * Returns whether this compound tag contains the given key.
* *
@ -42,12 +42,12 @@ public final class CompoundTag extends Tag {
public boolean containsKey(final String key) { public boolean containsKey(final String key) {
return this.value.containsKey(key); return this.value.containsKey(key);
} }
@Override @Override
public Map<String, Tag> getValue() { public Map<String, Tag> getValue() {
return this.value; return this.value;
} }
/** /**
* Return a new compound tag with the given values. * Return a new compound tag with the given values.
* *
@ -58,7 +58,7 @@ public final class CompoundTag extends Tag {
public CompoundTag setValue(final Map<String, Tag> value) { public CompoundTag setValue(final Map<String, Tag> value) {
return new CompoundTag(getName(), value); return new CompoundTag(getName(), value);
} }
/** /**
* Create a compound tag builder. * Create a compound tag builder.
* *
@ -67,7 +67,7 @@ public final class CompoundTag extends Tag {
public CompoundTagBuilder createBuilder() { public CompoundTagBuilder createBuilder() {
return new CompoundTagBuilder(new HashMap<String, Tag>(this.value)); return new CompoundTagBuilder(new HashMap<String, Tag>(this.value));
} }
/** /**
* Get a byte array named with the given key. <p/> <p> If the key does not exist or its value is not a byte array * Get a byte array named with the given key. <p/> <p> If the key does not exist or its value is not a byte array
* tag, then an empty byte array will be returned. </p> * tag, then an empty byte array will be returned. </p>
@ -84,7 +84,7 @@ public final class CompoundTag extends Tag {
return new byte[0]; return new byte[0];
} }
} }
/** /**
* Get a byte named with the given key. <p/> <p> If the key does not exist or its value is not a byte tag, then * Get a byte named with the given key. <p/> <p> If the key does not exist or its value is not a byte tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -101,7 +101,7 @@ public final class CompoundTag extends Tag {
return (byte) 0; return (byte) 0;
} }
} }
/** /**
* Get a double named with the given key. <p/> <p> If the key does not exist or its value is not a double tag, then * Get a double named with the given key. <p/> <p> If the key does not exist or its value is not a double tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -118,7 +118,7 @@ public final class CompoundTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a double named with the given key, even if it's another type of number. <p/> <p> If the key does not exist or * Get a double named with the given key, even if it's another type of number. <p/> <p> If the key does not exist or
* its value is not a number, then {@code 0} will be returned. </p> * its value is not a number, then {@code 0} will be returned. </p>
@ -145,7 +145,7 @@ public final class CompoundTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a float named with the given key. <p/> <p> If the key does not exist or its value is not a float tag, then * Get a float named with the given key. <p/> <p> If the key does not exist or its value is not a float tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -162,7 +162,7 @@ public final class CompoundTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a {@code int[]} named with the given key. <p/> <p> If the key does not exist or its value is not an int array * Get a {@code int[]} named with the given key. <p/> <p> If the key does not exist or its value is not an int array
* tag, then an empty array will be returned. </p> * tag, then an empty array will be returned. </p>
@ -179,7 +179,7 @@ public final class CompoundTag extends Tag {
return new int[0]; return new int[0];
} }
} }
/** /**
* Get an int named with the given key. <p/> <p> If the key does not exist or its value is not an int tag, then * Get an int named with the given key. <p/> <p> If the key does not exist or its value is not an int tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -196,7 +196,7 @@ public final class CompoundTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get an int named with the given key, even if it's another type of number. <p/> <p> If the key does not exist or * Get an int named with the given key, even if it's another type of number. <p/> <p> If the key does not exist or
* its value is not a number, then {@code 0} will be returned. </p> * its value is not a number, then {@code 0} will be returned. </p>
@ -223,7 +223,7 @@ public final class CompoundTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a list of tags named with the given key. <p/> <p> If the key does not exist or its value is not a list tag, * Get a list of tags named with the given key. <p/> <p> If the key does not exist or its value is not a list tag,
* then an empty list will be returned. </p> * then an empty list will be returned. </p>
@ -240,7 +240,7 @@ public final class CompoundTag extends Tag {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
/** /**
* Get a {@code TagList} named with the given key. <p/> <p> If the key does not exist or its value is not a list * Get a {@code TagList} named with the given key. <p/> <p> If the key does not exist or its value is not a list
* tag, then an empty tag list will be returned. </p> * tag, then an empty tag list will be returned. </p>
@ -257,7 +257,7 @@ public final class CompoundTag extends Tag {
return new ListTag(key, StringTag.class, Collections.<Tag> emptyList()); return new ListTag(key, StringTag.class, Collections.<Tag> emptyList());
} }
} }
/** /**
* Get a list of tags named with the given key. <p/> <p> If the key does not exist or its value is not a list tag, * Get a list of tags named with the given key. <p/> <p> If the key does not exist or its value is not a list tag,
* then an empty list will be returned. If the given key references a list but the list of of a different type, then * then an empty list will be returned. If the given key references a list but the list of of a different type, then
@ -283,7 +283,7 @@ public final class CompoundTag extends Tag {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
/** /**
* Get a long named with the given key. <p/> <p> If the key does not exist or its value is not a long tag, then * Get a long named with the given key. <p/> <p> If the key does not exist or its value is not a long tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -300,7 +300,7 @@ public final class CompoundTag extends Tag {
return 0L; return 0L;
} }
} }
/** /**
* Get a long named with the given key, even if it's another type of number. <p/> <p> If the key does not exist or * Get a long named with the given key, even if it's another type of number. <p/> <p> If the key does not exist or
* its value is not a number, then {@code 0} will be returned. </p> * its value is not a number, then {@code 0} will be returned. </p>
@ -327,7 +327,7 @@ public final class CompoundTag extends Tag {
return 0L; return 0L;
} }
} }
/** /**
* Get a short named with the given key. <p/> <p> If the key does not exist or its value is not a short tag, then * Get a short named with the given key. <p/> <p> If the key does not exist or its value is not a short tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -344,7 +344,7 @@ public final class CompoundTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a string named with the given key. <p/> <p> If the key does not exist or its value is not a string tag, then * Get a string named with the given key. <p/> <p> If the key does not exist or its value is not a string tag, then
* {@code ""} will be returned. </p> * {@code ""} will be returned. </p>
@ -361,7 +361,7 @@ public final class CompoundTag extends Tag {
return ""; return "";
} }
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

32
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java
View File

@ -10,14 +10,14 @@ import java.util.Map;
*/ */
public class CompoundTagBuilder { public class CompoundTagBuilder {
private final Map<String, Tag> entries; private final Map<String, Tag> entries;
/** /**
* Create a new instance. * Create a new instance.
*/ */
CompoundTagBuilder() { CompoundTagBuilder() {
this.entries = new HashMap<String, Tag>(); this.entries = new HashMap<String, Tag>();
} }
/** /**
* Create a new instance and use the given map (which will be modified). * Create a new instance and use the given map (which will be modified).
* *
@ -27,7 +27,7 @@ public class CompoundTagBuilder {
checkNotNull(value); checkNotNull(value);
this.entries = value; this.entries = value;
} }
/** /**
* Create a new builder instance. * Create a new builder instance.
* *
@ -36,7 +36,7 @@ public class CompoundTagBuilder {
public static CompoundTagBuilder create() { public static CompoundTagBuilder create() {
return new CompoundTagBuilder(); return new CompoundTagBuilder();
} }
/** /**
* Put the given key and tag into the compound tag. * Put the given key and tag into the compound tag.
* *
@ -51,7 +51,7 @@ public class CompoundTagBuilder {
this.entries.put(key, value); this.entries.put(key, value);
return this; return this;
} }
/** /**
* Put the given key and value into the compound tag as a {@code ByteArrayTag}. * Put the given key and value into the compound tag as a {@code ByteArrayTag}.
* *
@ -63,7 +63,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putByteArray(final String key, final byte[] value) { public CompoundTagBuilder putByteArray(final String key, final byte[] value) {
return put(key, new ByteArrayTag(key, value)); return put(key, new ByteArrayTag(key, value));
} }
/** /**
* Put the given key and value into the compound tag as a {@code ByteTag}. * Put the given key and value into the compound tag as a {@code ByteTag}.
* *
@ -75,7 +75,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putByte(final String key, final byte value) { public CompoundTagBuilder putByte(final String key, final byte value) {
return put(key, new ByteTag(key, value)); return put(key, new ByteTag(key, value));
} }
/** /**
* Put the given key and value into the compound tag as a {@code DoubleTag}. * Put the given key and value into the compound tag as a {@code DoubleTag}.
* *
@ -87,7 +87,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putDouble(final String key, final double value) { public CompoundTagBuilder putDouble(final String key, final double value) {
return put(key, new DoubleTag(key, value)); return put(key, new DoubleTag(key, value));
} }
/** /**
* Put the given key and value into the compound tag as a {@code FloatTag}. * Put the given key and value into the compound tag as a {@code FloatTag}.
* *
@ -99,7 +99,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putFloat(final String key, final float value) { public CompoundTagBuilder putFloat(final String key, final float value) {
return put(key, new FloatTag(key, value)); return put(key, new FloatTag(key, value));
} }
/** /**
* Put the given key and value into the compound tag as a {@code IntArrayTag}. * Put the given key and value into the compound tag as a {@code IntArrayTag}.
* *
@ -111,7 +111,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putIntArray(final String key, final int[] value) { public CompoundTagBuilder putIntArray(final String key, final int[] value) {
return put(key, new IntArrayTag(key, value)); return put(key, new IntArrayTag(key, value));
} }
/** /**
* Put the given key and value into the compound tag as an {@code IntTag}. * Put the given key and value into the compound tag as an {@code IntTag}.
* *
@ -123,7 +123,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putInt(final String key, final int value) { public CompoundTagBuilder putInt(final String key, final int value) {
return put(key, new IntTag(key, value)); return put(key, new IntTag(key, value));
} }
/** /**
* Put the given key and value into the compound tag as a {@code LongTag}. * Put the given key and value into the compound tag as a {@code LongTag}.
* *
@ -135,7 +135,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putLong(final String key, final long value) { public CompoundTagBuilder putLong(final String key, final long value) {
return put(key, new LongTag(key, value)); return put(key, new LongTag(key, value));
} }
/** /**
* Put the given key and value into the compound tag as a {@code ShortTag}. * Put the given key and value into the compound tag as a {@code ShortTag}.
* *
@ -147,7 +147,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putShort(final String key, final short value) { public CompoundTagBuilder putShort(final String key, final short value) {
return put(key, new ShortTag(key, value)); return put(key, new ShortTag(key, value));
} }
/** /**
* Put the given key and value into the compound tag as a {@code StringTag}. * Put the given key and value into the compound tag as a {@code StringTag}.
* *
@ -159,7 +159,7 @@ public class CompoundTagBuilder {
public CompoundTagBuilder putString(final String key, final String value) { public CompoundTagBuilder putString(final String key, final String value) {
return put(key, new StringTag(key, value)); return put(key, new StringTag(key, value));
} }
/** /**
* Put all the entries from the given map into this map. * Put all the entries from the given map into this map.
* *
@ -174,7 +174,7 @@ public class CompoundTagBuilder {
} }
return this; return this;
} }
/** /**
* Build an unnamed compound tag with this builder's entries. * Build an unnamed compound tag with this builder's entries.
* *
@ -183,7 +183,7 @@ public class CompoundTagBuilder {
public CompoundTag build() { public CompoundTag build() {
return new CompoundTag(new HashMap<String, Tag>(this.entries)); return new CompoundTag(new HashMap<String, Tag>(this.entries));
} }
/** /**
* Build a new compound tag with this builder's entries. * Build a new compound tag with this builder's entries.
* *

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java
View File

@ -5,7 +5,7 @@ package com.intellectualcrafters.jnbt;
*/ */
public final class DoubleTag extends Tag { public final class DoubleTag extends Tag {
private final double value; private final double value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -15,7 +15,7 @@ public final class DoubleTag extends Tag {
super(); super();
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -26,12 +26,12 @@ public final class DoubleTag extends Tag {
super(name); super(name);
this.value = value; this.value = value;
} }
@Override @Override
public Double getValue() { public Double getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

4
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/EndTag.java
View File

@ -10,12 +10,12 @@ public final class EndTag extends Tag {
public EndTag() { public EndTag() {
super(); super();
} }
@Override @Override
public Object getValue() { public Object getValue() {
return null; return null;
} }
@Override @Override
public String toString() { public String toString() {
return "TAG_End"; return "TAG_End";

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java
View File

@ -5,7 +5,7 @@ package com.intellectualcrafters.jnbt;
*/ */
public final class FloatTag extends Tag { public final class FloatTag extends Tag {
private final float value; private final float value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -15,7 +15,7 @@ public final class FloatTag extends Tag {
super(); super();
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -26,12 +26,12 @@ public final class FloatTag extends Tag {
super(name); super(name);
this.value = value; this.value = value;
} }
@Override @Override
public Float getValue() { public Float getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java
View File

@ -7,7 +7,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/ */
public final class IntArrayTag extends Tag { public final class IntArrayTag extends Tag {
private final int[] value; private final int[] value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -18,7 +18,7 @@ public final class IntArrayTag extends Tag {
checkNotNull(value); checkNotNull(value);
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -30,12 +30,12 @@ public final class IntArrayTag extends Tag {
checkNotNull(value); checkNotNull(value);
this.value = value; this.value = value;
} }
@Override @Override
public int[] getValue() { public int[] getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final StringBuilder hex = new StringBuilder(); final StringBuilder hex = new StringBuilder();

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntTag.java
View File

@ -5,7 +5,7 @@ package com.intellectualcrafters.jnbt;
*/ */
public final class IntTag extends Tag { public final class IntTag extends Tag {
private final int value; private final int value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -15,7 +15,7 @@ public final class IntTag extends Tag {
super(); super();
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -26,12 +26,12 @@ public final class IntTag extends Tag {
super(name); super(name);
this.value = value; this.value = value;
} }
@Override @Override
public Integer getValue() { public Integer getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

44
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTag.java
View File

@ -14,7 +14,7 @@ import javax.annotation.Nullable;
public final class ListTag extends Tag { public final class ListTag extends Tag {
private final Class<? extends Tag> type; private final Class<? extends Tag> type;
private final List<Tag> value; private final List<Tag> value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -27,7 +27,7 @@ public final class ListTag extends Tag {
this.type = type; this.type = type;
this.value = Collections.unmodifiableList(value); this.value = Collections.unmodifiableList(value);
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -41,7 +41,7 @@ public final class ListTag extends Tag {
this.type = type; this.type = type;
this.value = Collections.unmodifiableList(value); this.value = Collections.unmodifiableList(value);
} }
/** /**
* Gets the type of item in this list. * Gets the type of item in this list.
* *
@ -50,12 +50,12 @@ public final class ListTag extends Tag {
public Class<? extends Tag> getType() { public Class<? extends Tag> getType() {
return this.type; return this.type;
} }
@Override @Override
public List<Tag> getValue() { public List<Tag> getValue() {
return this.value; return this.value;
} }
/** /**
* Create a new list tag with this tag's name and type. * Create a new list tag with this tag's name and type.
* *
@ -66,7 +66,7 @@ public final class ListTag extends Tag {
public ListTag setValue(final List<Tag> list) { public ListTag setValue(final List<Tag> list) {
return new ListTag(getName(), getType(), list); return new ListTag(getName(), getType(), list);
} }
/** /**
* Get the tag if it exists at the given index. * Get the tag if it exists at the given index.
* *
@ -82,7 +82,7 @@ public final class ListTag extends Tag {
return null; return null;
} }
} }
/** /**
* Get a byte array named with the given index. <p/> <p> If the index does not exist or its value is not a byte * Get a byte array named with the given index. <p/> <p> If the index does not exist or its value is not a byte
* array tag, then an empty byte array will be returned. </p> * array tag, then an empty byte array will be returned. </p>
@ -99,7 +99,7 @@ public final class ListTag extends Tag {
return new byte[0]; return new byte[0];
} }
} }
/** /**
* Get a byte named with the given index. <p/> <p> If the index does not exist or its value is not a byte tag, then * Get a byte named with the given index. <p/> <p> If the index does not exist or its value is not a byte tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -116,7 +116,7 @@ public final class ListTag extends Tag {
return (byte) 0; return (byte) 0;
} }
} }
/** /**
* Get a double named with the given index. <p/> <p> If the index does not exist or its value is not a double tag, * Get a double named with the given index. <p/> <p> If the index does not exist or its value is not a double tag,
* then {@code 0} will be returned. </p> * then {@code 0} will be returned. </p>
@ -133,7 +133,7 @@ public final class ListTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a double named with the given index, even if it's another type of number. <p/> <p> If the index does not * Get a double named with the given index, even if it's another type of number. <p/> <p> If the index does not
* exist or its value is not a number, then {@code 0} will be returned. </p> * exist or its value is not a number, then {@code 0} will be returned. </p>
@ -160,7 +160,7 @@ public final class ListTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a float named with the given index. <p/> <p> If the index does not exist or its value is not a float tag, * Get a float named with the given index. <p/> <p> If the index does not exist or its value is not a float tag,
* then {@code 0} will be returned. </p> * then {@code 0} will be returned. </p>
@ -177,7 +177,7 @@ public final class ListTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a {@code int[]} named with the given index. <p/> <p> If the index does not exist or its value is not an int * Get a {@code int[]} named with the given index. <p/> <p> If the index does not exist or its value is not an int
* array tag, then an empty array will be returned. </p> * array tag, then an empty array will be returned. </p>
@ -194,7 +194,7 @@ public final class ListTag extends Tag {
return new int[0]; return new int[0];
} }
} }
/** /**
* Get an int named with the given index. <p/> <p> If the index does not exist or its value is not an int tag, then * Get an int named with the given index. <p/> <p> If the index does not exist or its value is not an int tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -211,7 +211,7 @@ public final class ListTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get an int named with the given index, even if it's another type of number. <p/> <p> If the index does not exist * Get an int named with the given index, even if it's another type of number. <p/> <p> If the index does not exist
* or its value is not a number, then {@code 0} will be returned. </p> * or its value is not a number, then {@code 0} will be returned. </p>
@ -238,7 +238,7 @@ public final class ListTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a list of tags named with the given index. <p/> <p> If the index does not exist or its value is not a list * Get a list of tags named with the given index. <p/> <p> If the index does not exist or its value is not a list
* tag, then an empty list will be returned. </p> * tag, then an empty list will be returned. </p>
@ -255,7 +255,7 @@ public final class ListTag extends Tag {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
/** /**
* Get a {@code TagList} named with the given index. <p/> <p> If the index does not exist or its value is not a list * Get a {@code TagList} named with the given index. <p/> <p> If the index does not exist or its value is not a list
* tag, then an empty tag list will be returned. </p> * tag, then an empty tag list will be returned. </p>
@ -272,7 +272,7 @@ public final class ListTag extends Tag {
return new ListTag(StringTag.class, Collections.<Tag> emptyList()); return new ListTag(StringTag.class, Collections.<Tag> emptyList());
} }
} }
/** /**
* Get a list of tags named with the given index. <p/> <p> If the index does not exist or its value is not a list * Get a list of tags named with the given index. <p/> <p> If the index does not exist or its value is not a list
* tag, then an empty list will be returned. If the given index references a list but the list of of a different * tag, then an empty list will be returned. If the given index references a list but the list of of a different
@ -298,7 +298,7 @@ public final class ListTag extends Tag {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
/** /**
* Get a long named with the given index. <p/> <p> If the index does not exist or its value is not a long tag, then * Get a long named with the given index. <p/> <p> If the index does not exist or its value is not a long tag, then
* {@code 0} will be returned. </p> * {@code 0} will be returned. </p>
@ -315,7 +315,7 @@ public final class ListTag extends Tag {
return 0L; return 0L;
} }
} }
/** /**
* Get a long named with the given index, even if it's another type of number. <p/> <p> If the index does not exist * Get a long named with the given index, even if it's another type of number. <p/> <p> If the index does not exist
* or its value is not a number, then {@code 0} will be returned. </p> * or its value is not a number, then {@code 0} will be returned. </p>
@ -342,7 +342,7 @@ public final class ListTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a short named with the given index. <p/> <p> If the index does not exist or its value is not a short tag, * Get a short named with the given index. <p/> <p> If the index does not exist or its value is not a short tag,
* then {@code 0} will be returned. </p> * then {@code 0} will be returned. </p>
@ -359,7 +359,7 @@ public final class ListTag extends Tag {
return 0; return 0;
} }
} }
/** /**
* Get a string named with the given index. <p/> <p> If the index does not exist or its value is not a string tag, * Get a string named with the given index. <p/> <p> If the index does not exist or its value is not a string tag,
* then {@code ""} will be returned. </p> * then {@code ""} will be returned. </p>
@ -376,7 +376,7 @@ public final class ListTag extends Tag {
return ""; return "";
} }
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

14
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java
View File

@ -13,7 +13,7 @@ import java.util.List;
public class ListTagBuilder { public class ListTagBuilder {
private final Class<? extends Tag> type; private final Class<? extends Tag> type;
private final List<Tag> entries; private final List<Tag> entries;
/** /**
* Create a new instance. * Create a new instance.
* *
@ -24,7 +24,7 @@ public class ListTagBuilder {
this.type = type; this.type = type;
this.entries = new ArrayList<Tag>(); this.entries = new ArrayList<Tag>();
} }
/** /**
* Create a new builder instance. * Create a new builder instance.
* *
@ -33,7 +33,7 @@ public class ListTagBuilder {
public static ListTagBuilder create(final Class<? extends Tag> type) { public static ListTagBuilder create(final Class<? extends Tag> type) {
return new ListTagBuilder(type); return new ListTagBuilder(type);
} }
/** /**
* Create a new builder instance. * Create a new builder instance.
* *
@ -55,7 +55,7 @@ public class ListTagBuilder {
builder.addAll(Arrays.asList(entries)); builder.addAll(Arrays.asList(entries));
return builder; return builder;
} }
/** /**
* Add the given tag. * Add the given tag.
* *
@ -71,7 +71,7 @@ public class ListTagBuilder {
this.entries.add(value); this.entries.add(value);
return this; return this;
} }
/** /**
* Add all the tags in the given list. * Add all the tags in the given list.
* *
@ -86,7 +86,7 @@ public class ListTagBuilder {
} }
return this; return this;
} }
/** /**
* Build an unnamed list tag with this builder's entries. * Build an unnamed list tag with this builder's entries.
* *
@ -95,7 +95,7 @@ public class ListTagBuilder {
public ListTag build() { public ListTag build() {
return new ListTag(this.type, new ArrayList<Tag>(this.entries)); return new ListTag(this.type, new ArrayList<Tag>(this.entries));
} }
/** /**
* Build a new list tag with this builder's entries. * Build a new list tag with this builder's entries.
* *

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/LongTag.java
View File

@ -5,7 +5,7 @@ package com.intellectualcrafters.jnbt;
*/ */
public final class LongTag extends Tag { public final class LongTag extends Tag {
private final long value; private final long value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -15,7 +15,7 @@ public final class LongTag extends Tag {
super(); super();
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -26,12 +26,12 @@ public final class LongTag extends Tag {
super(name); super(name);
this.value = value; this.value = value;
} }
@Override @Override
public Long getValue() { public Long getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

4
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java
View File

@ -28,13 +28,13 @@ import java.nio.charset.Charset;
public final class NBTConstants { public final class NBTConstants {
public static final Charset CHARSET = Charset.forName("UTF-8"); 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; 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. * Default private constructor.
*/ */
private NBTConstants() { private NBTConstants() {
} }
/** /**
* Convert a type ID to its corresponding {@link Tag} class. * Convert a type ID to its corresponding {@link Tag} class.
* *

10
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java
View File

@ -16,7 +16,7 @@ import java.util.Map;
*/ */
public final class NBTInputStream implements Closeable { public final class NBTInputStream implements Closeable {
private final DataInputStream is; private final DataInputStream is;
/** /**
* Creates a new {@code NBTInputStream}, which will source its data from the specified input stream. * Creates a new {@code NBTInputStream}, which will source its data from the specified input stream.
* *
@ -27,7 +27,7 @@ public final class NBTInputStream implements Closeable {
public NBTInputStream(final InputStream is) throws IOException { public NBTInputStream(final InputStream is) throws IOException {
this.is = new DataInputStream(is); this.is = new DataInputStream(is);
} }
/** /**
* Reads an NBT tag from the stream. * Reads an NBT tag from the stream.
* *
@ -38,7 +38,7 @@ public final class NBTInputStream implements Closeable {
public Tag readTag() throws IOException { public Tag readTag() throws IOException {
return readTag(0); return readTag(0);
} }
/** /**
* Reads an NBT from the stream. * Reads an NBT from the stream.
* *
@ -61,7 +61,7 @@ public final class NBTInputStream implements Closeable {
} }
return readTagPayload(type, name, depth); return readTagPayload(type, name, depth);
} }
/** /**
* Reads the payload of a tag, given the name and type. * Reads the payload of a tag, given the name and type.
* *
@ -137,7 +137,7 @@ public final class NBTInputStream implements Closeable {
throw new IOException("Invalid tag type: " + type + "."); throw new IOException("Invalid tag type: " + type + ".");
} }
} }
@Override @Override
public void close() throws IOException { public void close() throws IOException {
this.is.close(); this.is.close();

32
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java
View File

@ -39,7 +39,7 @@ public final class NBTOutputStream implements Closeable {
* The output stream. * The output stream.
*/ */
private final DataOutputStream os; private final DataOutputStream os;
/** /**
* Creates a new <code>NBTOutputStream</code>, which will write data to the specified underlying output stream. * Creates a new <code>NBTOutputStream</code>, which will write data to the specified underlying output stream.
* *
@ -50,7 +50,7 @@ public final class NBTOutputStream implements Closeable {
public NBTOutputStream(final OutputStream os) throws IOException { public NBTOutputStream(final OutputStream os) throws IOException {
this.os = new DataOutputStream(os); this.os = new DataOutputStream(os);
} }
/** /**
* Writes a tag. * Writes a tag.
* *
@ -70,7 +70,7 @@ public final class NBTOutputStream implements Closeable {
} }
writeTagPayload(tag); writeTagPayload(tag);
} }
/** /**
* Writes tag payload. * Writes tag payload.
* *
@ -121,7 +121,7 @@ public final class NBTOutputStream implements Closeable {
throw new IOException("Invalid tag type: " + type + "."); throw new IOException("Invalid tag type: " + type + ".");
} }
} }
/** /**
* Writes a <code>TAG_Byte</code> tag. * Writes a <code>TAG_Byte</code> tag.
* *
@ -132,7 +132,7 @@ public final class NBTOutputStream implements Closeable {
private void writeByteTagPayload(final ByteTag tag) throws IOException { private void writeByteTagPayload(final ByteTag tag) throws IOException {
this.os.writeByte(tag.getValue()); this.os.writeByte(tag.getValue());
} }
/** /**
* Writes a <code>TAG_Byte_Array</code> tag. * Writes a <code>TAG_Byte_Array</code> tag.
* *
@ -145,7 +145,7 @@ public final class NBTOutputStream implements Closeable {
this.os.writeInt(bytes.length); this.os.writeInt(bytes.length);
this.os.write(bytes); this.os.write(bytes);
} }
/** /**
* Writes a <code>TAG_Compound</code> tag. * Writes a <code>TAG_Compound</code> tag.
* *
@ -159,7 +159,7 @@ public final class NBTOutputStream implements Closeable {
} }
this.os.writeByte((byte) 0); // end tag - better way? this.os.writeByte((byte) 0); // end tag - better way?
} }
/** /**
* Writes a <code>TAG_List</code> tag. * Writes a <code>TAG_List</code> tag.
* *
@ -177,7 +177,7 @@ public final class NBTOutputStream implements Closeable {
writeTagPayload(tag1); writeTagPayload(tag1);
} }
} }
/** /**
* Writes a <code>TAG_String</code> tag. * Writes a <code>TAG_String</code> tag.
* *
@ -190,7 +190,7 @@ public final class NBTOutputStream implements Closeable {
this.os.writeShort(bytes.length); this.os.writeShort(bytes.length);
this.os.write(bytes); this.os.write(bytes);
} }
/** /**
* Writes a <code>TAG_Double</code> tag. * Writes a <code>TAG_Double</code> tag.
* *
@ -201,7 +201,7 @@ public final class NBTOutputStream implements Closeable {
private void writeDoubleTagPayload(final DoubleTag tag) throws IOException { private void writeDoubleTagPayload(final DoubleTag tag) throws IOException {
this.os.writeDouble(tag.getValue()); this.os.writeDouble(tag.getValue());
} }
/** /**
* Writes a <code>TAG_Float</code> tag. * Writes a <code>TAG_Float</code> tag.
* *
@ -212,7 +212,7 @@ public final class NBTOutputStream implements Closeable {
private void writeFloatTagPayload(final FloatTag tag) throws IOException { private void writeFloatTagPayload(final FloatTag tag) throws IOException {
this.os.writeFloat(tag.getValue()); this.os.writeFloat(tag.getValue());
} }
/** /**
* Writes a <code>TAG_Long</code> tag. * Writes a <code>TAG_Long</code> tag.
* *
@ -223,7 +223,7 @@ public final class NBTOutputStream implements Closeable {
private void writeLongTagPayload(final LongTag tag) throws IOException { private void writeLongTagPayload(final LongTag tag) throws IOException {
this.os.writeLong(tag.getValue()); this.os.writeLong(tag.getValue());
} }
/** /**
* Writes a <code>TAG_Int</code> tag. * Writes a <code>TAG_Int</code> tag.
* *
@ -234,7 +234,7 @@ public final class NBTOutputStream implements Closeable {
private void writeIntTagPayload(final IntTag tag) throws IOException { private void writeIntTagPayload(final IntTag tag) throws IOException {
this.os.writeInt(tag.getValue()); this.os.writeInt(tag.getValue());
} }
/** /**
* Writes a <code>TAG_Short</code> tag. * Writes a <code>TAG_Short</code> tag.
* *
@ -245,7 +245,7 @@ public final class NBTOutputStream implements Closeable {
private void writeShortTagPayload(final ShortTag tag) throws IOException { private void writeShortTagPayload(final ShortTag tag) throws IOException {
this.os.writeShort(tag.getValue()); this.os.writeShort(tag.getValue());
} }
/** /**
* Writes a <code>TAG_Empty</code> tag. * Writes a <code>TAG_Empty</code> tag.
* *
@ -256,7 +256,7 @@ public final class NBTOutputStream implements Closeable {
private void writeEndTagPayload(final EndTag tag) { private void writeEndTagPayload(final EndTag tag) {
/* empty */ /* empty */
} }
private void writeIntArrayTagPayload(final IntArrayTag tag) throws IOException { private void writeIntArrayTagPayload(final IntArrayTag tag) throws IOException {
final int[] data = tag.getValue(); final int[] data = tag.getValue();
this.os.writeInt(data.length); this.os.writeInt(data.length);
@ -264,7 +264,7 @@ public final class NBTOutputStream implements Closeable {
this.os.writeInt(element); this.os.writeInt(element);
} }
} }
@Override @Override
public void close() throws IOException { public void close() throws IOException {
this.os.close(); this.os.close();

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java
View File

@ -11,7 +11,7 @@ public final class NBTUtils {
*/ */
private NBTUtils() { private NBTUtils() {
} }
/** /**
* Gets the type name of a tag. * Gets the type name of a tag.
* *
@ -48,7 +48,7 @@ public final class NBTUtils {
throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ")."); throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ").");
} }
} }
/** /**
* Gets the type code of a tag class. * Gets the type code of a tag class.
* *
@ -87,7 +87,7 @@ public final class NBTUtils {
throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ")."); throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ").");
} }
} }
/** /**
* Gets the class of a type of tag. * Gets the class of a type of tag.
* *
@ -127,7 +127,7 @@ public final class NBTUtils {
throw new IllegalArgumentException("Invalid tag type : " + type + "."); throw new IllegalArgumentException("Invalid tag type : " + type + ".");
} }
} }
/** /**
* Get child tag of a NBT structure. * Get child tag of a NBT structure.
* *

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java
View File

@ -25,7 +25,7 @@ package com.intellectualcrafters.jnbt;
*/ */
public final class ShortTag extends Tag { public final class ShortTag extends Tag {
private final short value; private final short value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -35,7 +35,7 @@ public final class ShortTag extends Tag {
super(); super();
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -46,12 +46,12 @@ public final class ShortTag extends Tag {
super(name); super(name);
this.value = value; this.value = value;
} }
@Override @Override
public Short getValue() { public Short getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/StringTag.java
View File

@ -7,7 +7,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/ */
public final class StringTag extends Tag { public final class StringTag extends Tag {
private final String value; private final String value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -18,7 +18,7 @@ public final class StringTag extends Tag {
checkNotNull(value); checkNotNull(value);
this.value = value; this.value = value;
} }
/** /**
* Creates the tag. * Creates the tag.
* *
@ -30,12 +30,12 @@ public final class StringTag extends Tag {
checkNotNull(value); checkNotNull(value);
this.value = value; this.value = value;
} }
@Override @Override
public String getValue() { public String getValue() {
return this.value; return this.value;
} }
@Override @Override
public String toString() { public String toString() {
final String name = getName(); final String name = getName();

8
PlotSquared/src/main/java/com/intellectualcrafters/jnbt/Tag.java
View File

@ -25,14 +25,14 @@ package com.intellectualcrafters.jnbt;
*/ */
public abstract class Tag { public abstract class Tag {
private final String name; private final String name;
/** /**
* Create a new tag with an empty name. * Create a new tag with an empty name.
*/ */
Tag() { Tag() {
this(""); this("");
} }
/** /**
* Creates the tag with the specified name. * Creates the tag with the specified name.
* *
@ -44,7 +44,7 @@ public abstract class Tag {
} }
this.name = name; this.name = name;
} }
/** /**
* Gets the name of this tag. * Gets the name of this tag.
* *
@ -53,7 +53,7 @@ public abstract class Tag {
public final String getName() { public final String getName() {
return this.name; return this.name;
} }
/** /**
* Gets the value of this tag. * Gets the value of this tag.
* *

18
PlotSquared/src/main/java/com/intellectualcrafters/json/CDL.java
View File

@ -60,7 +60,7 @@ public class CDL {
return x.nextTo(','); return x.nextTo(',');
} }
} }
/** /**
* Produce a JSONArray of strings from a row of comma delimited values. * Produce a JSONArray of strings from a row of comma delimited values.
* *
@ -93,7 +93,7 @@ public class CDL {
} }
} }
} }
/** /**
* Produce a JSONObject from a row of comma delimited text, using a parallel JSONArray of strings to provides the * Produce a JSONObject from a row of comma delimited text, using a parallel JSONArray of strings to provides the
* names of the elements. * names of the elements.
@ -110,7 +110,7 @@ public class CDL {
final JSONArray ja = rowToJSONArray(x); final JSONArray ja = rowToJSONArray(x);
return ja != null ? ja.toJSONObject(names) : null; return ja != null ? ja.toJSONObject(names) : null;
} }
/** /**
* Produce a comma delimited text row from a JSONArray. Values containing the comma character will be quoted. * Produce a comma delimited text row from a JSONArray. Values containing the comma character will be quoted.
* Troublesome characters may be removed. * Troublesome characters may be removed.
@ -146,7 +146,7 @@ public class CDL {
sb.append('\n'); sb.append('\n');
return sb.toString(); return sb.toString();
} }
/** /**
* Produce a JSONArray of JSONObjects from a comma delimited text string, using the first row as a source of names. * Produce a JSONArray of JSONObjects from a comma delimited text string, using the first row as a source of names.
* *
@ -159,7 +159,7 @@ public class CDL {
public static JSONArray toJSONArray(final String string) throws JSONException { public static JSONArray toJSONArray(final String string) throws JSONException {
return toJSONArray(new JSONTokener(string)); return toJSONArray(new JSONTokener(string));
} }
/** /**
* Produce a JSONArray of JSONObjects from a comma delimited text string, using the first row as a source of names. * Produce a JSONArray of JSONObjects from a comma delimited text string, using the first row as a source of names.
* *
@ -172,7 +172,7 @@ public class CDL {
public static JSONArray toJSONArray(final JSONTokener x) throws JSONException { public static JSONArray toJSONArray(final JSONTokener x) throws JSONException {
return toJSONArray(rowToJSONArray(x), x); return toJSONArray(rowToJSONArray(x), x);
} }
/** /**
* Produce a JSONArray of JSONObjects from a comma delimited text string using a supplied JSONArray as the source of * Produce a JSONArray of JSONObjects from a comma delimited text string using a supplied JSONArray as the source of
* element names. * element names.
@ -187,7 +187,7 @@ public class CDL {
public static JSONArray toJSONArray(final JSONArray names, final String string) throws JSONException { public static JSONArray toJSONArray(final JSONArray names, final String string) throws JSONException {
return toJSONArray(names, new JSONTokener(string)); return toJSONArray(names, new JSONTokener(string));
} }
/** /**
* Produce a JSONArray of JSONObjects from a comma delimited text string using a supplied JSONArray as the source of * Produce a JSONArray of JSONObjects from a comma delimited text string using a supplied JSONArray as the source of
* element names. * element names.
@ -216,7 +216,7 @@ public class CDL {
} }
return ja; return ja;
} }
/** /**
* Produce a comma delimited text from a JSONArray of JSONObjects. The first row will be a list of names obtained by * Produce a comma delimited text from a JSONArray of JSONObjects. The first row will be a list of names obtained by
* inspecting the first JSONObject. * inspecting the first JSONObject.
@ -237,7 +237,7 @@ public class CDL {
} }
return null; return null;
} }
/** /**
* Produce a comma delimited text from a JSONArray of JSONObjects using a provided list of names. The list of names * Produce a comma delimited text from a JSONArray of JSONObjects using a provided list of names. The list of names
* is not included in the output. * is not included in the output.

6
PlotSquared/src/main/java/com/intellectualcrafters/json/Cookie.java
View File

@ -56,7 +56,7 @@ public class Cookie {
} }
return sb.toString(); return sb.toString();
} }
/** /**
* Convert a cookie specification string into a JSONObject. The string will contain a name value pair separated by * Convert a cookie specification string into a JSONObject. The string will contain a name value pair separated by
* '='. The name and the value will be unescaped, possibly converting '+' and '%' sequences. The cookie properties * '='. The name and the value will be unescaped, possibly converting '+' and '%' sequences. The cookie properties
@ -96,7 +96,7 @@ public class Cookie {
} }
return jo; return jo;
} }
/** /**
* Convert a JSONObject into a cookie specification string. The JSONObject must contain "name" and "value" members. * Convert a JSONObject into a cookie specification string. The JSONObject must contain "name" and "value" members.
* If the JSONObject contains "expires", "domain", "path", or "secure" members, they will be appended to the cookie * If the JSONObject contains "expires", "domain", "path", or "secure" members, they will be appended to the cookie
@ -130,7 +130,7 @@ public class Cookie {
} }
return sb.toString(); return sb.toString();
} }
/** /**
* Convert <code>%</code><i>hh</i> sequences to single characters, and convert plus to space. * Convert <code>%</code><i>hh</i> sequences to single characters, and convert plus to space.
* *

2
PlotSquared/src/main/java/com/intellectualcrafters/json/CookieList.java
View File

@ -34,7 +34,7 @@ public class CookieList {
} }
return jo; return jo;
} }
/** /**
* Convert a JSONObject into a cookie list. A cookie list is a sequence of name/value pairs. The names are separated * Convert a JSONObject into a cookie list. A cookie list is a sequence of name/value pairs. The names are separated
* from the values by '='. The pairs are separated by ';'. The characters '%', '+', '=', and ';' in the names and * from the values by '='. The pairs are separated by ';'. The characters '%', '+', '=', and ';' in the names and

4
PlotSquared/src/main/java/com/intellectualcrafters/json/HTTP.java
View File

@ -33,7 +33,7 @@ public class HTTP {
* Carriage return/line feed. * Carriage return/line feed.
*/ */
public static final String CRLF = "\r\n"; public static final String CRLF = "\r\n";
/** /**
* Convert an HTTP header string into a JSONObject. It can be a request header or a response header. A request * Convert an HTTP header string into a JSONObject. It can be a request header or a response header. A request
* header will contain * header will contain
@ -113,7 +113,7 @@ public class HTTP {
} }
return jo; return jo;
} }
/** /**
* Convert a JSONObject into an HTTP header. A request header must contain * Convert a JSONObject into an HTTP header. A request header must contain
* <p/> * <p/>

2
PlotSquared/src/main/java/com/intellectualcrafters/json/HTTPTokener.java
View File

@ -15,7 +15,7 @@ public class HTTPTokener extends JSONTokener {
public HTTPTokener(final String string) { public HTTPTokener(final String string) {
super(string); super(string);
} }
/** /**
* Get the next token or string. This is used in parsing HTTP headers. * Get the next token or string. This is used in parsing HTTP headers.
* *

100
PlotSquared/src/main/java/com/intellectualcrafters/json/JSONArray.java
View File

@ -61,14 +61,14 @@ public class JSONArray {
* The arrayList where the JSONArray's properties are kept. * The arrayList where the JSONArray's properties are kept.
*/ */
private final ArrayList<Object> myArrayList; private final ArrayList<Object> myArrayList;
/** /**
* Construct an empty JSONArray. * Construct an empty JSONArray.
*/ */
public JSONArray() { public JSONArray() {
this.myArrayList = new ArrayList<Object>(); this.myArrayList = new ArrayList<Object>();
} }
/** /**
* Construct a JSONArray from a JSONTokener. * Construct a JSONArray from a JSONTokener.
* *
@ -106,7 +106,7 @@ public class JSONArray {
} }
} }
} }
/** /**
* Construct a JSONArray from a source JSON text. * Construct a JSONArray from a source JSON text.
* *
@ -118,7 +118,7 @@ public class JSONArray {
public JSONArray(final String source) throws JSONException { public JSONArray(final String source) throws JSONException {
this(new JSONTokener(source)); this(new JSONTokener(source));
} }
/** /**
* Construct a JSONArray from a Collection. * Construct a JSONArray from a Collection.
* *
@ -132,7 +132,7 @@ public class JSONArray {
} }
} }
} }
/** /**
* Construct a JSONArray from an array * Construct a JSONArray from an array
* *
@ -149,7 +149,7 @@ public class JSONArray {
throw new JSONException("JSONArray initial value should be a string or collection or array."); throw new JSONException("JSONArray initial value should be a string or collection or array.");
} }
} }
/** /**
* Get the object value associated with an index. * Get the object value associated with an index.
* *
@ -166,7 +166,7 @@ public class JSONArray {
} }
return object; return object;
} }
/** /**
* Get the boolean value associated with an index. The string values "true" and "false" are converted to boolean. * Get the boolean value associated with an index. The string values "true" and "false" are converted to boolean.
* *
@ -185,7 +185,7 @@ public class JSONArray {
} }
throw new JSONException("JSONArray[" + index + "] is not a boolean."); throw new JSONException("JSONArray[" + index + "] is not a boolean.");
} }
/** /**
* Get the double value associated with an index. * Get the double value associated with an index.
* *
@ -203,7 +203,7 @@ public class JSONArray {
throw new JSONException("JSONArray[" + index + "] is not a number."); throw new JSONException("JSONArray[" + index + "] is not a number.");
} }
} }
/** /**
* Get the int value associated with an index. * Get the int value associated with an index.
* *
@ -221,7 +221,7 @@ public class JSONArray {
throw new JSONException("JSONArray[" + index + "] is not a number."); throw new JSONException("JSONArray[" + index + "] is not a number.");
} }
} }
/** /**
* Get the JSONArray associated with an index. * Get the JSONArray associated with an index.
* *
@ -238,7 +238,7 @@ public class JSONArray {
} }
throw new JSONException("JSONArray[" + index + "] is not a JSONArray."); throw new JSONException("JSONArray[" + index + "] is not a JSONArray.");
} }
/** /**
* Get the JSONObject associated with an index. * Get the JSONObject associated with an index.
* *
@ -255,7 +255,7 @@ public class JSONArray {
} }
throw new JSONException("JSONArray[" + index + "] is not a JSONObject."); throw new JSONException("JSONArray[" + index + "] is not a JSONObject.");
} }
/** /**
* Get the long value associated with an index. * Get the long value associated with an index.
* *
@ -273,7 +273,7 @@ public class JSONArray {
throw new JSONException("JSONArray[" + index + "] is not a number."); throw new JSONException("JSONArray[" + index + "] is not a number.");
} }
} }
/** /**
* Get the string associated with an index. * Get the string associated with an index.
* *
@ -290,7 +290,7 @@ public class JSONArray {
} }
throw new JSONException("JSONArray[" + index + "] not a string."); throw new JSONException("JSONArray[" + index + "] not a string.");
} }
/** /**
* Determine if the value is null. * Determine if the value is null.
* *
@ -301,7 +301,7 @@ public class JSONArray {
public boolean isNull(final int index) { public boolean isNull(final int index) {
return JSONObject.NULL.equals(this.opt(index)); return JSONObject.NULL.equals(this.opt(index));
} }
/** /**
* Make a string from the contents of this JSONArray. The <code>separator</code> string is inserted between each * Make a string from the contents of this JSONArray. The <code>separator</code> string is inserted between each
* element. Warning: This method assumes that the data structure is acyclical. * element. Warning: This method assumes that the data structure is acyclical.
@ -323,7 +323,7 @@ public class JSONArray {
} }
return sb.toString(); return sb.toString();
} }
/** /**
* Get the number of elements in the JSONArray, included nulls. * Get the number of elements in the JSONArray, included nulls.
* *
@ -332,7 +332,7 @@ public class JSONArray {
public int length() { public int length() {
return this.myArrayList.size(); return this.myArrayList.size();
} }
/** /**
* Get the optional object value associated with an index. * Get the optional object value associated with an index.
* *
@ -343,7 +343,7 @@ public class JSONArray {
public Object opt(final int index) { public Object opt(final int index) {
return ((index < 0) || (index >= this.length())) ? null : this.myArrayList.get(index); return ((index < 0) || (index >= this.length())) ? null : this.myArrayList.get(index);
} }
/** /**
* Get the optional boolean value associated with an index. It returns false if there is no value at that index, or * Get the optional boolean value associated with an index. It returns false if there is no value at that index, or
* if the value is not Boolean.TRUE or the String "true". * if the value is not Boolean.TRUE or the String "true".
@ -355,7 +355,7 @@ public class JSONArray {
public boolean optBoolean(final int index) { public boolean optBoolean(final int index) {
return this.optBoolean(index, false); return this.optBoolean(index, false);
} }
/** /**
* Get the optional boolean value associated with an index. It returns the defaultValue if there is no value at that * Get the optional boolean value associated with an index. It returns the defaultValue if there is no value at that
* index or if it is not a Boolean or the String "true" or "false" (case insensitive). * index or if it is not a Boolean or the String "true" or "false" (case insensitive).
@ -372,7 +372,7 @@ public class JSONArray {
return defaultValue; return defaultValue;
} }
} }
/** /**
* Get the optional double value associated with an index. NaN is returned if there is no value for the index, or if * Get the optional double value associated with an index. NaN is returned if there is no value for the index, or if
* the value is not a number and cannot be converted to a number. * the value is not a number and cannot be converted to a number.
@ -384,7 +384,7 @@ public class JSONArray {
public double optDouble(final int index) { public double optDouble(final int index) {
return this.optDouble(index, Double.NaN); return this.optDouble(index, Double.NaN);
} }
/** /**
* Get the optional double value associated with an index. The defaultValue is returned if there is no value for the * Get the optional double value associated with an index. The defaultValue is returned if there is no value for the
* index, or if the value is not a number and cannot be converted to a number. * index, or if the value is not a number and cannot be converted to a number.
@ -401,7 +401,7 @@ public class JSONArray {
return defaultValue; return defaultValue;
} }
} }
/** /**
* Get the optional int value associated with an index. Zero is returned if there is no value for the index, or if * Get the optional int value associated with an index. Zero is returned if there is no value for the index, or if
* the value is not a number and cannot be converted to a number. * the value is not a number and cannot be converted to a number.
@ -413,7 +413,7 @@ public class JSONArray {
public int optInt(final int index) { public int optInt(final int index) {
return this.optInt(index, 0); return this.optInt(index, 0);
} }
/** /**
* Get the optional int value associated with an index. The defaultValue is returned if there is no value for the * Get the optional int value associated with an index. The defaultValue is returned if there is no value for the
* index, or if the value is not a number and cannot be converted to a number. * index, or if the value is not a number and cannot be converted to a number.
@ -430,7 +430,7 @@ public class JSONArray {
return defaultValue; return defaultValue;
} }
} }
/** /**
* Get the optional JSONArray associated with an index. * Get the optional JSONArray associated with an index.
* *
@ -442,7 +442,7 @@ public class JSONArray {
final Object o = this.opt(index); final Object o = this.opt(index);
return o instanceof JSONArray ? (JSONArray) o : null; return o instanceof JSONArray ? (JSONArray) o : null;
} }
/** /**
* Get the optional JSONObject associated with an index. Null is returned if the key is not found, or null if the * Get the optional JSONObject associated with an index. Null is returned if the key is not found, or null if the
* index has no value, or if the value is not a JSONObject. * index has no value, or if the value is not a JSONObject.
@ -455,7 +455,7 @@ public class JSONArray {
final Object o = this.opt(index); final Object o = this.opt(index);
return o instanceof JSONObject ? (JSONObject) o : null; return o instanceof JSONObject ? (JSONObject) o : null;
} }
/** /**
* Get the optional long value associated with an index. Zero is returned if there is no value for the index, or if * Get the optional long value associated with an index. Zero is returned if there is no value for the index, or if
* the value is not a number and cannot be converted to a number. * the value is not a number and cannot be converted to a number.
@ -467,7 +467,7 @@ public class JSONArray {
public long optLong(final int index) { public long optLong(final int index) {
return this.optLong(index, 0); return this.optLong(index, 0);
} }
/** /**
* Get the optional long value associated with an index. The defaultValue is returned if there is no value for the * Get the optional long value associated with an index. The defaultValue is returned if there is no value for the
* index, or if the value is not a number and cannot be converted to a number. * index, or if the value is not a number and cannot be converted to a number.
@ -484,7 +484,7 @@ public class JSONArray {
return defaultValue; return defaultValue;
} }
} }
/** /**
* Get the optional string value associated with an index. It returns an empty string if there is no value at that * Get the optional string value associated with an index. It returns an empty string if there is no value at that
* index. If the value is not a string and is not null, then it is coverted to a string. * index. If the value is not a string and is not null, then it is coverted to a string.
@ -496,7 +496,7 @@ public class JSONArray {
public String optString(final int index) { public String optString(final int index) {
return this.optString(index, ""); return this.optString(index, "");
} }
/** /**
* Get the optional string associated with an index. The defaultValue is returned if the key is not found. * Get the optional string associated with an index. The defaultValue is returned if the key is not found.
* *
@ -509,7 +509,7 @@ public class JSONArray {
final Object object = this.opt(index); final Object object = this.opt(index);
return JSONObject.NULL.equals(object) ? defaultValue : object.toString(); return JSONObject.NULL.equals(object) ? defaultValue : object.toString();
} }
/** /**
* Append a boolean value. This increases the array's length by one. * Append a boolean value. This increases the array's length by one.
* *
@ -521,7 +521,7 @@ public class JSONArray {
this.put(value ? Boolean.TRUE : Boolean.FALSE); this.put(value ? Boolean.TRUE : Boolean.FALSE);
return this; return this;
} }
/** /**
* Put a value in the JSONArray, where the value will be a JSONArray which is produced from a Collection. * Put a value in the JSONArray, where the value will be a JSONArray which is produced from a Collection.
* *
@ -533,7 +533,7 @@ public class JSONArray {
this.put(new JSONArray(value)); this.put(new JSONArray(value));
return this; return this;
} }
/** /**
* Append a double value. This increases the array's length by one. * Append a double value. This increases the array's length by one.
* *
@ -549,7 +549,7 @@ public class JSONArray {
this.put(d); this.put(d);
return this; return this;
} }
/** /**
* Append an int value. This increases the array's length by one. * Append an int value. This increases the array's length by one.
* *
@ -561,7 +561,7 @@ public class JSONArray {
this.put(new Integer(value)); this.put(new Integer(value));
return this; return this;
} }
/** /**
* Append an long value. This increases the array's length by one. * Append an long value. This increases the array's length by one.
* *
@ -573,7 +573,7 @@ public class JSONArray {
this.put(new Long(value)); this.put(new Long(value));
return this; return this;
} }
/** /**
* Put a value in the JSONArray, where the value will be a JSONObject which is produced from a Map. * Put a value in the JSONArray, where the value will be a JSONObject which is produced from a Map.
* *
@ -585,7 +585,7 @@ public class JSONArray {
this.put(new JSONObject(value)); this.put(new JSONObject(value));
return this; return this;
} }
/** /**
* Append an object value. This increases the array's length by one. * Append an object value. This increases the array's length by one.
* *
@ -598,7 +598,7 @@ public class JSONArray {
this.myArrayList.add(value); this.myArrayList.add(value);
return this; return this;
} }
/** /**
* Put or replace a boolean value in the JSONArray. If the index is greater than the length of the JSONArray, then * Put or replace a boolean value in the JSONArray. If the index is greater than the length of the JSONArray, then
* null elements will be added as necessary to pad it out. * null elements will be added as necessary to pad it out.
@ -614,7 +614,7 @@ public class JSONArray {
this.put(index, value ? Boolean.TRUE : Boolean.FALSE); this.put(index, value ? Boolean.TRUE : Boolean.FALSE);
return this; return this;
} }
/** /**
* Put a value in the JSONArray, where the value will be a JSONArray which is produced from a Collection. * Put a value in the JSONArray, where the value will be a JSONArray which is produced from a Collection.
* *
@ -629,7 +629,7 @@ public class JSONArray {
this.put(index, new JSONArray(value)); this.put(index, new JSONArray(value));
return this; return this;
} }
/** /**
* Put or replace a double value. If the index is greater than the length of the JSONArray, then null elements will * Put or replace a double value. If the index is greater than the length of the JSONArray, then null elements will
* be added as necessary to pad it out. * be added as necessary to pad it out.
@ -645,7 +645,7 @@ public class JSONArray {
this.put(index, new Double(value)); this.put(index, new Double(value));
return this; return this;
} }
/** /**
* Put or replace an int value. If the index is greater than the length of the JSONArray, then null elements will be * Put or replace an int value. If the index is greater than the length of the JSONArray, then null elements will be
* added as necessary to pad it out. * added as necessary to pad it out.
@ -661,7 +661,7 @@ public class JSONArray {
this.put(index, new Integer(value)); this.put(index, new Integer(value));
return this; return this;
} }
/** /**
* Put or replace a long value. If the index is greater than the length of the JSONArray, then null elements will be * Put or replace a long value. If the index is greater than the length of the JSONArray, then null elements will be
* added as necessary to pad it out. * added as necessary to pad it out.
@ -677,7 +677,7 @@ public class JSONArray {
this.put(index, new Long(value)); this.put(index, new Long(value));
return this; return this;
} }
/** /**
* Put a value in the JSONArray, where the value will be a JSONObject that is produced from a Map. * Put a value in the JSONArray, where the value will be a JSONObject that is produced from a Map.
* *
@ -692,7 +692,7 @@ public class JSONArray {
this.put(index, new JSONObject(value)); this.put(index, new JSONObject(value));
return this; return this;
} }
/** /**
* Put or replace an object value in the JSONArray. If the index is greater than the length of the JSONArray, then * Put or replace an object value in the JSONArray. If the index is greater than the length of the JSONArray, then
* null elements will be added as necessary to pad it out. * null elements will be added as necessary to pad it out.
@ -720,7 +720,7 @@ public class JSONArray {
} }
return this; return this;
} }
/** /**
* Remove an index and close the hole. * Remove an index and close the hole.
* *
@ -731,7 +731,7 @@ public class JSONArray {
public Object remove(final int index) { public Object remove(final int index) {
return (index >= 0) && (index < this.length()) ? this.myArrayList.remove(index) : null; return (index >= 0) && (index < this.length()) ? this.myArrayList.remove(index) : null;
} }
/** /**
* Determine if two JSONArrays are similar. They must contain similar sequences. * Determine if two JSONArrays are similar. They must contain similar sequences.
* *
@ -764,7 +764,7 @@ public class JSONArray {
} }
return true; return true;
} }
/** /**
* Produce a JSONObject by combining a JSONArray of names with the values of this JSONArray. * Produce a JSONObject by combining a JSONArray of names with the values of this JSONArray.
* *
@ -784,7 +784,7 @@ public class JSONArray {
} }
return jo; return jo;
} }
/** /**
* Make a JSON text of this JSONArray. For compactness, no unnecessary whitespace is added. If it is not possible to * Make a JSON text of this JSONArray. For compactness, no unnecessary whitespace is added. If it is not possible to
* produce a syntactically correct JSON text then null will be returned instead. This could occur if the array * produce a syntactically correct JSON text then null will be returned instead. This could occur if the array
@ -802,7 +802,7 @@ public class JSONArray {
return null; return null;
} }
} }
/** /**
* Make a prettyprinted JSON text of this JSONArray. Warning: This method assumes that the data structure is * Make a prettyprinted JSON text of this JSONArray. Warning: This method assumes that the data structure is
* acyclical. * acyclical.
@ -821,7 +821,7 @@ public class JSONArray {
return this.write(sw, indentFactor, 0).toString(); return this.write(sw, indentFactor, 0).toString();
} }
} }
/** /**
* Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added. * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
* <p/> * <p/>
@ -834,7 +834,7 @@ public class JSONArray {
public Writer write(final Writer writer) throws JSONException { public Writer write(final Writer writer) throws JSONException {
return this.write(writer, 0, 0); return this.write(writer, 0, 0);
} }
/** /**
* Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added. * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
* <p/> * <p/>

6
PlotSquared/src/main/java/com/intellectualcrafters/json/JSONException.java
View File

@ -9,7 +9,7 @@ package com.intellectualcrafters.json;
public class JSONException extends RuntimeException { public class JSONException extends RuntimeException {
private static final long serialVersionUID = 0; private static final long serialVersionUID = 0;
private Throwable cause; private Throwable cause;
/** /**
* Constructs a JSONException with an explanatory message. * Constructs a JSONException with an explanatory message.
* *
@ -18,7 +18,7 @@ public class JSONException extends RuntimeException {
public JSONException(final String message) { public JSONException(final String message) {
super(message); super(message);
} }
/** /**
* Constructs a new JSONException with the specified cause. * Constructs a new JSONException with the specified cause.
* *
@ -28,7 +28,7 @@ public class JSONException extends RuntimeException {
super(cause.getMessage()); super(cause.getMessage());
this.cause = cause; this.cause = cause;
} }
/** /**
* Returns the cause of this exception or null if the cause is nonexistent or unknown. * Returns the cause of this exception or null if the cause is nonexistent or unknown.
* *

12
PlotSquared/src/main/java/com/intellectualcrafters/json/JSONML.java
View File

@ -183,7 +183,7 @@ public class JSONML {
} }
} }
} }
/** /**
* Convert a well-formed (but not necessarily valid) XML string into a JSONArray using the JsonML transform. Each * Convert a well-formed (but not necessarily valid) XML string into a JSONArray using the JsonML transform. Each
* XML tag is represented as a JSONArray in which the first element is the tag name. If the tag has attributes, then * XML tag is represented as a JSONArray in which the first element is the tag name. If the tag has attributes, then
@ -199,7 +199,7 @@ public class JSONML {
public static JSONArray toJSONArray(final String string) throws JSONException { public static JSONArray toJSONArray(final String string) throws JSONException {
return toJSONArray(new XMLTokener(string)); return toJSONArray(new XMLTokener(string));
} }
/** /**
* Convert a well-formed (but not necessarily valid) XML string into a JSONArray using the JsonML transform. Each * Convert a well-formed (but not necessarily valid) XML string into a JSONArray using the JsonML transform. Each
* XML tag is represented as a JSONArray in which the first element is the tag name. If the tag has attributes, then * XML tag is represented as a JSONArray in which the first element is the tag name. If the tag has attributes, then
@ -216,7 +216,7 @@ public class JSONML {
public static JSONArray toJSONArray(final XMLTokener x) throws JSONException { public static JSONArray toJSONArray(final XMLTokener x) throws JSONException {
return (JSONArray) parse(x, true, null); return (JSONArray) parse(x, true, null);
} }
/** /**
* Convert a well-formed (but not necessarily valid) XML string into a JSONObject using the JsonML transform. Each * Convert a well-formed (but not necessarily valid) XML string into a JSONObject using the JsonML transform. Each
* XML tag is represented as a JSONObject with a "tagName" property. If the tag has attributes, then the attributes * XML tag is represented as a JSONObject with a "tagName" property. If the tag has attributes, then the attributes
@ -234,7 +234,7 @@ public class JSONML {
public static JSONObject toJSONObject(final XMLTokener x) throws JSONException { public static JSONObject toJSONObject(final XMLTokener x) throws JSONException {
return (JSONObject) parse(x, false, null); return (JSONObject) parse(x, false, null);
} }
/** /**
* Convert a well-formed (but not necessarily valid) XML string into a JSONObject using the JsonML transform. Each * Convert a well-formed (but not necessarily valid) XML string into a JSONObject using the JsonML transform. Each
* XML tag is represented as a JSONObject with a "tagName" property. If the tag has attributes, then the attributes * XML tag is represented as a JSONObject with a "tagName" property. If the tag has attributes, then the attributes
@ -252,7 +252,7 @@ public class JSONML {
public static JSONObject toJSONObject(final String string) throws JSONException { public static JSONObject toJSONObject(final String string) throws JSONException {
return toJSONObject(new XMLTokener(string)); return toJSONObject(new XMLTokener(string));
} }
/** /**
* Reverse the JSONML transformation, making an XML text from a JSONArray. * Reverse the JSONML transformation, making an XML text from a JSONArray.
* *
@ -327,7 +327,7 @@ public class JSONML {
} }
return sb.toString(); return sb.toString();
} }
/** /**
* Reverse the JSONML transformation, making an XML text from a JSONObject. The JSONObject must contain a "tagName" * Reverse the JSONML transformation, making an XML text from a JSONObject. The JSONObject must contain a "tagName"
* property. If it has children, then it must have a "childNodes" property containing an array of objects. The other * property. If it has children, then it must have a "childNodes" property containing an array of objects. The other

140
PlotSquared/src/main/java/com/intellectualcrafters/json/JSONObject.java
View File

@ -64,14 +64,14 @@ public class JSONObject {
* The map where the JSONObject's properties are kept. * The map where the JSONObject's properties are kept.
*/ */
private final Map<String, Object> map; private final Map<String, Object> map;
/** /**
* Construct an empty JSONObject. * Construct an empty JSONObject.
*/ */
public JSONObject() { public JSONObject() {
this.map = new HashMap<String, Object>(); this.map = new HashMap<String, Object>();
} }
/** /**
* Construct a JSONObject from a subset of another JSONObject. An array of strings is used to identify the keys that * Construct a JSONObject from a subset of another JSONObject. An array of strings is used to identify the keys that
* should be copied. Missing keys are ignored. * should be copied. Missing keys are ignored.
@ -91,7 +91,7 @@ public class JSONObject {
} }
} }
} }
/** /**
* Construct a JSONObject from a JSONTokener. * Construct a JSONObject from a JSONTokener.
* *
@ -139,7 +139,7 @@ public class JSONObject {
} }
} }
} }
/** /**
* Construct a JSONObject from a Map. * Construct a JSONObject from a Map.
* *
@ -158,7 +158,7 @@ public class JSONObject {
} }
} }
} }
/** /**
* Construct a JSONObject from an Object using bean getters. It reflects on all of the public methods of the object. * Construct a JSONObject from an Object using bean getters. It reflects on all of the public methods of the object.
* For each of the methods with no parameters and a name starting with <code>"get"</code> or <code>"is"</code> * For each of the methods with no parameters and a name starting with <code>"get"</code> or <code>"is"</code>
@ -178,7 +178,7 @@ public class JSONObject {
this(); this();
this.populateMap(bean); this.populateMap(bean);
} }
/** /**
* Construct a JSONObject from an Object, using reflection to find the public members. The resulting JSONObject's * Construct a JSONObject from an Object, using reflection to find the public members. The resulting JSONObject's
* keys will be the strings from the names array, and the values will be the field values associated with those keys * keys will be the strings from the names array, and the values will be the field values associated with those keys
@ -197,7 +197,7 @@ public class JSONObject {
} }
} }
} }
/** /**
* Construct a JSONObject from a source JSON text string. This is the most commonly used JSONObject constructor. * Construct a JSONObject from a source JSON text string. This is the most commonly used JSONObject constructor.
* *
@ -209,7 +209,7 @@ public class JSONObject {
public JSONObject(final String source) throws JSONException { public JSONObject(final String source) throws JSONException {
this(new JSONTokener(source)); this(new JSONTokener(source));
} }
/** /**
* Construct a JSONObject from a ResourceBundle. * Construct a JSONObject from a ResourceBundle.
* *
@ -247,7 +247,7 @@ public class JSONObject {
} }
} }
} }
/** /**
* Produce a string from a double. The string "null" will be returned if the number is not finite. * Produce a string from a double. The string "null" will be returned if the number is not finite.
* *
@ -271,7 +271,7 @@ public class JSONObject {
} }
return string; return string;
} }
/** /**
* Get an array of field names from a JSONObject. * Get an array of field names from a JSONObject.
* *
@ -291,7 +291,7 @@ public class JSONObject {
} }
return names; return names;
} }
/** /**
* Get an array of field names from an Object. * Get an array of field names from an Object.
* *
@ -313,7 +313,7 @@ public class JSONObject {
} }
return names; return names;
} }
/** /**
* Produce a string from a Number. * Produce a string from a Number.
* *
@ -340,7 +340,7 @@ public class JSONObject {
} }
return string; return string;
} }
/** /**
* Produce a string in double quotes with backslash sequences in all the right places. A backslash will be inserted * Produce a string in double quotes with backslash sequences in all the right places. A backslash will be inserted
* within </, producing <\/, allowing JSON text to be delivered in HTML. In JSON text, a string cannot contain a * within </, producing <\/, allowing JSON text to be delivered in HTML. In JSON text, a string cannot contain a
@ -361,7 +361,7 @@ public class JSONObject {
} }
} }
} }
public static Writer quote(final String string, final Writer w) throws IOException { public static Writer quote(final String string, final Writer w) throws IOException {
if ((string == null) || (string.length() == 0)) { if ((string == null) || (string.length() == 0)) {
w.write("\"\""); w.write("\"\"");
@ -417,7 +417,7 @@ public class JSONObject {
w.write('"'); w.write('"');
return w; return w;
} }
/** /**
* Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string. * Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string.
* *
@ -466,7 +466,7 @@ public class JSONObject {
} }
return string; return string;
} }
/** /**
* Throw an exception if the object is a NaN or infinite number. * Throw an exception if the object is a NaN or infinite number.
* *
@ -487,7 +487,7 @@ public class JSONObject {
} }
} }
} }
/** /**
* Make a JSON text of an Object value. If the object has an value.toJSONString() method, then that method will be * Make a JSON text of an Object value. If the object has an value.toJSONString() method, then that method will be
* used to produce the JSON text. The method is required to produce a strictly conforming text. If the object does * used to produce the JSON text. The method is required to produce a strictly conforming text. If the object does
@ -540,7 +540,7 @@ public class JSONObject {
} }
return quote(value.toString()); return quote(value.toString());
} }
/** /**
* Wrap an object, if necessary. If the object is null, return the NULL object. If it is an array or collection, * Wrap an object, if necessary. If the object is null, return the NULL object. If it is an array or collection,
* wrap it in a JSONArray. If it is a map, wrap it in a JSONObject. If it is a standard property (Double, String, et * wrap it in a JSONArray. If it is a map, wrap it in a JSONObject. If it is a standard property (Double, String, et
@ -578,7 +578,7 @@ public class JSONObject {
return null; return null;
} }
} }
static final Writer writeValue(final Writer writer, final Object value, final int indentFactor, final int indent) throws JSONException, IOException { static final Writer writeValue(final Writer writer, final Object value, final int indentFactor, final int indent) throws JSONException, IOException {
if ((value == null) || value.equals(null)) { if ((value == null) || value.equals(null)) {
writer.write("null"); writer.write("null");
@ -609,13 +609,13 @@ public class JSONObject {
} }
return writer; return writer;
} }
static final void indent(final Writer writer, final int indent) throws IOException { static final void indent(final Writer writer, final int indent) throws IOException {
for (int i = 0; i < indent; i += 1) { for (int i = 0; i < indent; i += 1) {
writer.write(' '); writer.write(' ');
} }
} }
/** /**
* Accumulate values under a key. It is similar to the put method except that if there is already an object stored * Accumulate values under a key. It is similar to the put method except that if there is already an object stored
* under the key then a JSONArray is stored under the key to hold all of the accumulated values. If there is already * under the key then a JSONArray is stored under the key to hold all of the accumulated values. If there is already
@ -643,7 +643,7 @@ public class JSONObject {
} }
return this; return this;
} }
/** /**
* Append values to the array under a key. If the key does not exist in the JSONObject, then the key is put in the * Append values to the array under a key. If the key does not exist in the JSONObject, then the key is put in the
* JSONObject with its value being a JSONArray containing the value parameter. If the key was already associated * JSONObject with its value being a JSONArray containing the value parameter. If the key was already associated
@ -668,7 +668,7 @@ public class JSONObject {
} }
return this; return this;
} }
/** /**
* Get the value object associated with a key. * Get the value object associated with a key.
* *
@ -688,7 +688,7 @@ public class JSONObject {
} }
return object; return object;
} }
/** /**
* Get the boolean value associated with a key. * Get the boolean value associated with a key.
* *
@ -707,7 +707,7 @@ public class JSONObject {
} }
throw new JSONException("JSONObject[" + quote(key) + "] is not a Boolean."); throw new JSONException("JSONObject[" + quote(key) + "] is not a Boolean.");
} }
/** /**
* Get the double value associated with a key. * Get the double value associated with a key.
* *
@ -726,7 +726,7 @@ public class JSONObject {
throw new JSONException("JSONObject[" + quote(key) + "] is not a number."); throw new JSONException("JSONObject[" + quote(key) + "] is not a number.");
} }
} }
/** /**
* Get the int value associated with a key. * Get the int value associated with a key.
* *
@ -744,7 +744,7 @@ public class JSONObject {
throw new JSONException("JSONObject[" + quote(key) + "] is not an int."); throw new JSONException("JSONObject[" + quote(key) + "] is not an int.");
} }
} }
/** /**
* Get the JSONArray value associated with a key. * Get the JSONArray value associated with a key.
* *
@ -761,7 +761,7 @@ public class JSONObject {
} }
throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONArray."); throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONArray.");
} }
/** /**
* Get the JSONObject value associated with a key. * Get the JSONObject value associated with a key.
* *
@ -778,7 +778,7 @@ public class JSONObject {
} }
throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONObject."); throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONObject.");
} }
/** /**
* Get the long value associated with a key. * Get the long value associated with a key.
* *
@ -796,7 +796,7 @@ public class JSONObject {
throw new JSONException("JSONObject[" + quote(key) + "] is not a long."); throw new JSONException("JSONObject[" + quote(key) + "] is not a long.");
} }
} }
/** /**
* Get the string associated with a key. * Get the string associated with a key.
* *
@ -813,7 +813,7 @@ public class JSONObject {
} }
throw new JSONException("JSONObject[" + quote(key) + "] not a string."); throw new JSONException("JSONObject[" + quote(key) + "] not a string.");
} }
/** /**
* Determine if the JSONObject contains a specific key. * Determine if the JSONObject contains a specific key.
* *
@ -824,7 +824,7 @@ public class JSONObject {
public boolean has(final String key) { public boolean has(final String key) {
return this.map.containsKey(key); return this.map.containsKey(key);
} }
/** /**
* Increment a property of a JSONObject. If there is no such property, create one with a value of 1. If there is * Increment a property of a JSONObject. If there is no such property, create one with a value of 1. If there is
* such a property, and if it is an Integer, Long, Double, or Float, then add one to it. * such a property, and if it is an Integer, Long, Double, or Float, then add one to it.
@ -853,7 +853,7 @@ public class JSONObject {
} }
return this; return this;
} }
/** /**
* Determine if the value associated with the key is null or if there is no value. * Determine if the value associated with the key is null or if there is no value.
* *
@ -864,7 +864,7 @@ public class JSONObject {
public boolean isNull(final String key) { public boolean isNull(final String key) {
return JSONObject.NULL.equals(this.opt(key)); return JSONObject.NULL.equals(this.opt(key));
} }
/** /**
* Get an enumeration of the keys of the JSONObject. * Get an enumeration of the keys of the JSONObject.
* *
@ -873,7 +873,7 @@ public class JSONObject {
public Iterator<String> keys() { public Iterator<String> keys() {
return this.keySet().iterator(); return this.keySet().iterator();
} }
/** /**
* Get a set of keys of the JSONObject. * Get a set of keys of the JSONObject.
* *
@ -882,7 +882,7 @@ public class JSONObject {
public Set<String> keySet() { public Set<String> keySet() {
return this.map.keySet(); return this.map.keySet();
} }
/** /**
* Get the number of keys stored in the JSONObject. * Get the number of keys stored in the JSONObject.
* *
@ -891,7 +891,7 @@ public class JSONObject {
public int length() { public int length() {
return this.map.size(); return this.map.size();
} }
/** /**
* Produce a JSONArray containing the names of the elements of this JSONObject. * Produce a JSONArray containing the names of the elements of this JSONObject.
* *
@ -905,7 +905,7 @@ public class JSONObject {
} }
return ja.length() == 0 ? null : ja; return ja.length() == 0 ? null : ja;
} }
/** /**
* Get an optional value associated with a key. * Get an optional value associated with a key.
* *
@ -916,7 +916,7 @@ public class JSONObject {
public Object opt(final String key) { public Object opt(final String key) {
return key == null ? null : this.map.get(key); return key == null ? null : this.map.get(key);
} }
/** /**
* Get an optional boolean associated with a key. It returns false if there is no such key, or if the value is not * Get an optional boolean associated with a key. It returns false if there is no such key, or if the value is not
* Boolean.TRUE or the String "true". * Boolean.TRUE or the String "true".
@ -928,7 +928,7 @@ public class JSONObject {
public boolean optBoolean(final String key) { public boolean optBoolean(final String key) {
return this.optBoolean(key, false); return this.optBoolean(key, false);
} }
/** /**
* Get an optional boolean associated with a key. It returns the defaultValue if there is no such key, or if it is * Get an optional boolean associated with a key. It returns the defaultValue if there is no such key, or if it is
* not a Boolean or the String "true" or "false" (case insensitive). * not a Boolean or the String "true" or "false" (case insensitive).
@ -945,7 +945,7 @@ public class JSONObject {
return defaultValue; return defaultValue;
} }
} }
/** /**
* Get an optional double associated with a key, or NaN if there is no such key or if its value is not a number. If * Get an optional double associated with a key, or NaN if there is no such key or if its value is not a number. If
* the value is a string, an attempt will be made to evaluate it as a number. * the value is a string, an attempt will be made to evaluate it as a number.
@ -957,7 +957,7 @@ public class JSONObject {
public double optDouble(final String key) { public double optDouble(final String key) {
return this.optDouble(key, Double.NaN); return this.optDouble(key, Double.NaN);
} }
/** /**
* Get an optional double associated with a key, or the defaultValue if there is no such key or if its value is not * Get an optional double associated with a key, or the defaultValue if there is no such key or if its value is not
* a number. If the value is a string, an attempt will be made to evaluate it as a number. * a number. If the value is a string, an attempt will be made to evaluate it as a number.
@ -974,7 +974,7 @@ public class JSONObject {
return defaultValue; return defaultValue;
} }
} }
/** /**
* Get an optional int value associated with a key, or zero if there is no such key or if the value is not a number. * Get an optional int value associated with a key, or zero if there is no such key or if the value is not a number.
* If the value is a string, an attempt will be made to evaluate it as a number. * If the value is a string, an attempt will be made to evaluate it as a number.
@ -986,7 +986,7 @@ public class JSONObject {
public int optInt(final String key) { public int optInt(final String key) {
return this.optInt(key, 0); return this.optInt(key, 0);
} }
/** /**
* Get an optional int value associated with a key, or the default if there is no such key or if the value is not a * Get an optional int value associated with a key, or the default if there is no such key or if the value is not a
* number. If the value is a string, an attempt will be made to evaluate it as a number. * number. If the value is a string, an attempt will be made to evaluate it as a number.
@ -1003,7 +1003,7 @@ public class JSONObject {
return defaultValue; return defaultValue;
} }
} }
/** /**
* Get an optional JSONArray associated with a key. It returns null if there is no such key, or if its value is not * Get an optional JSONArray associated with a key. It returns null if there is no such key, or if its value is not
* a JSONArray. * a JSONArray.
@ -1016,7 +1016,7 @@ public class JSONObject {
final Object o = this.opt(key); final Object o = this.opt(key);
return o instanceof JSONArray ? (JSONArray) o : null; return o instanceof JSONArray ? (JSONArray) o : null;
} }
/** /**
* Get an optional JSONObject associated with a key. It returns null if there is no such key, or if its value is not * Get an optional JSONObject associated with a key. It returns null if there is no such key, or if its value is not
* a JSONObject. * a JSONObject.
@ -1029,7 +1029,7 @@ public class JSONObject {
final Object object = this.opt(key); final Object object = this.opt(key);
return object instanceof JSONObject ? (JSONObject) object : null; return object instanceof JSONObject ? (JSONObject) object : null;
} }
/** /**
* Get an optional long value associated with a key, or zero if there is no such key or if the value is not a * Get an optional long value associated with a key, or zero if there is no such key or if the value is not a
* number. If the value is a string, an attempt will be made to evaluate it as a number. * number. If the value is a string, an attempt will be made to evaluate it as a number.
@ -1041,7 +1041,7 @@ public class JSONObject {
public long optLong(final String key) { public long optLong(final String key) {
return this.optLong(key, 0); return this.optLong(key, 0);
} }
/** /**
* Get an optional long value associated with a key, or the default if there is no such key or if the value is not a * Get an optional long value associated with a key, or the default if there is no such key or if the value is not a
* number. If the value is a string, an attempt will be made to evaluate it as a number. * number. If the value is a string, an attempt will be made to evaluate it as a number.
@ -1058,7 +1058,7 @@ public class JSONObject {
return defaultValue; return defaultValue;
} }
} }
/** /**
* Get an optional string associated with a key. It returns an empty string if there is no such key. If the value is * Get an optional string associated with a key. It returns an empty string if there is no such key. If the value is
* not a string and is not null, then it is converted to a string. * not a string and is not null, then it is converted to a string.
@ -1070,7 +1070,7 @@ public class JSONObject {
public String optString(final String key) { public String optString(final String key) {
return this.optString(key, ""); return this.optString(key, "");
} }
/** /**
* Get an optional string associated with a key. It returns the defaultValue if there is no such key. * Get an optional string associated with a key. It returns the defaultValue if there is no such key.
* *
@ -1083,7 +1083,7 @@ public class JSONObject {
final Object object = this.opt(key); final Object object = this.opt(key);
return NULL.equals(object) ? defaultValue : object.toString(); return NULL.equals(object) ? defaultValue : object.toString();
} }
private void populateMap(final Object bean) { private void populateMap(final Object bean) {
final Class klass = bean.getClass(); final Class klass = bean.getClass();
// If klass is a System class then set includeSuperClass to false. // If klass is a System class then set includeSuperClass to false.
@ -1119,7 +1119,7 @@ public class JSONObject {
} }
} }
} }
/** /**
* Put a key/boolean pair in the JSONObject. * Put a key/boolean pair in the JSONObject.
* *
@ -1134,7 +1134,7 @@ public class JSONObject {
this.put(key, value ? Boolean.TRUE : Boolean.FALSE); this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
return this; return this;
} }
/** /**
* Put a key/value pair in the JSONObject, where the value will be a JSONArray which is produced from a Collection. * Put a key/value pair in the JSONObject, where the value will be a JSONArray which is produced from a Collection.
* *
@ -1149,7 +1149,7 @@ public class JSONObject {
this.put(key, new JSONArray(value)); this.put(key, new JSONArray(value));
return this; return this;
} }
/** /**
* Put a key/double pair in the JSONObject. * Put a key/double pair in the JSONObject.
* *
@ -1164,7 +1164,7 @@ public class JSONObject {
this.put(key, new Double(value)); this.put(key, new Double(value));
return this; return this;
} }
/** /**
* Put a key/int pair in the JSONObject. * Put a key/int pair in the JSONObject.
* *
@ -1179,7 +1179,7 @@ public class JSONObject {
this.put(key, new Integer(value)); this.put(key, new Integer(value));
return this; return this;
} }
/** /**
* Put a key/long pair in the JSONObject. * Put a key/long pair in the JSONObject.
* *
@ -1194,7 +1194,7 @@ public class JSONObject {
this.put(key, new Long(value)); this.put(key, new Long(value));
return this; return this;
} }
/** /**
* Put a key/value pair in the JSONObject, where the value will be a JSONObject which is produced from a Map. * Put a key/value pair in the JSONObject, where the value will be a JSONObject which is produced from a Map.
* *
@ -1209,7 +1209,7 @@ public class JSONObject {
this.put(key, new JSONObject(value)); this.put(key, new JSONObject(value));
return this; return this;
} }
/** /**
* Put a key/value pair in the JSONObject. If the value is null, then the key will be removed from the JSONObject if * Put a key/value pair in the JSONObject. If the value is null, then the key will be removed from the JSONObject if
* it is present. * it is present.
@ -1234,7 +1234,7 @@ public class JSONObject {
} }
return this; return this;
} }
/** /**
* Put a key/value pair in the JSONObject, but only if the key and the value are both non-null, and only if there is * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null, and only if there is
* not already a member with that name. * not already a member with that name.
@ -1255,7 +1255,7 @@ public class JSONObject {
} }
return this; return this;
} }
/** /**
* Put a key/value pair in the JSONObject, but only if the key and the value are both non-null. * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null.
* *
@ -1273,7 +1273,7 @@ public class JSONObject {
} }
return this; return this;
} }
/** /**
* Remove a name and its value, if present. * Remove a name and its value, if present.
* *
@ -1284,7 +1284,7 @@ public class JSONObject {
public Object remove(final String key) { public Object remove(final String key) {
return this.map.remove(key); return this.map.remove(key);
} }
/** /**
* Determine if two JSONObjects are similar. They must contain the same set of names which must be associated with * Determine if two JSONObjects are similar. They must contain the same set of names which must be associated with
* similar values. * similar values.
@ -1322,7 +1322,7 @@ public class JSONObject {
return false; return false;
} }
} }
/** /**
* Produce a JSONArray containing the values of the members of this JSONObject. * Produce a JSONArray containing the values of the members of this JSONObject.
* *
@ -1343,7 +1343,7 @@ public class JSONObject {
} }
return ja; return ja;
} }
/** /**
* Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would not result in a * Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would not result in a
* syntactically correct JSON text, then null will be returned instead. * syntactically correct JSON text, then null will be returned instead.
@ -1362,7 +1362,7 @@ public class JSONObject {
return null; return null;
} }
} }
/** /**
* Make a prettyprinted JSON text of this JSONObject. * Make a prettyprinted JSON text of this JSONObject.
* <p/> * <p/>
@ -1382,7 +1382,7 @@ public class JSONObject {
return this.write(w, indentFactor, 0).toString(); return this.write(w, indentFactor, 0).toString();
} }
} }
/** /**
* Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added. * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
* <p/> * <p/>
@ -1395,7 +1395,7 @@ public class JSONObject {
public Writer write(final Writer writer) throws JSONException { public Writer write(final Writer writer) throws JSONException {
return this.write(writer, 0, 0); return this.write(writer, 0, 0);
} }
/** /**
* Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added. * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
* <p/> * <p/>
@ -1449,7 +1449,7 @@ public class JSONObject {
throw new JSONException(exception); throw new JSONException(exception);
} }
} }
/** /**
* JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is equivalent to the * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is equivalent to the
* value that JavaScript calls undefined. * value that JavaScript calls undefined.
@ -1468,7 +1468,7 @@ public class JSONObject {
return this; return this;
} }
} }
/** /**
* A Null object is equal to the null value and to itself. * A Null object is equal to the null value and to itself.
* *
@ -1480,7 +1480,7 @@ public class JSONObject {
public boolean equals(final Object object) { public boolean equals(final Object object) {
return (object == null) || (object == this); return (object == null) || (object == this);
} }
/** /**
* Get the "null" string value. * Get the "null" string value.
* *

2
PlotSquared/src/main/java/com/intellectualcrafters/json/JSONStringer.java
View File

@ -40,7 +40,7 @@ public class JSONStringer extends JSONWriter {
public JSONStringer() { public JSONStringer() {
super(new StringWriter()); super(new StringWriter());
} }
/** /**
* Return the JSON text. This method is used to obtain the product of the JSONStringer instance. It will return * Return the JSON text. This method is used to obtain the product of the JSONStringer instance. It will return
* <code>null</code> if there was a problem in the construction of the JSON text (such as the calls to * <code>null</code> if there was a problem in the construction of the JSON text (such as the calls to

36
PlotSquared/src/main/java/com/intellectualcrafters/json/JSONTokener.java
View File

@ -22,7 +22,7 @@ public class JSONTokener {
private long line; private long line;
private char previous; private char previous;
private boolean usePrevious; private boolean usePrevious;
/** /**
* Construct a JSONTokener from a Reader. * Construct a JSONTokener from a Reader.
* *
@ -37,7 +37,7 @@ public class JSONTokener {
this.character = 1; this.character = 1;
this.line = 1; this.line = 1;
} }
/** /**
* Construct a JSONTokener from an InputStream. * Construct a JSONTokener from an InputStream.
* *
@ -46,7 +46,7 @@ public class JSONTokener {
public JSONTokener(final InputStream inputStream) throws JSONException { public JSONTokener(final InputStream inputStream) throws JSONException {
this(new InputStreamReader(inputStream)); this(new InputStreamReader(inputStream));
} }
/** /**
* Construct a JSONTokener from a string. * Construct a JSONTokener from a string.
* *
@ -55,7 +55,7 @@ public class JSONTokener {
public JSONTokener(final String s) { public JSONTokener(final String s) {
this(new StringReader(s)); this(new StringReader(s));
} }
/** /**
* Get the hex value of a character (base16). * Get the hex value of a character (base16).
* *
@ -75,7 +75,7 @@ public class JSONTokener {
} }
return -1; return -1;
} }
/** /**
* Back up one character. This provides a sort of lookahead capability, so that you can test for a digit or letter * Back up one character. This provides a sort of lookahead capability, so that you can test for a digit or letter
* before attempting to parse the next number or identifier. * before attempting to parse the next number or identifier.
@ -89,11 +89,11 @@ public class JSONTokener {
this.usePrevious = true; this.usePrevious = true;
this.eof = false; this.eof = false;
} }
public boolean end() { public boolean end() {
return this.eof && !this.usePrevious; return this.eof && !this.usePrevious;
} }
/** /**
* Determine if the source string still contains characters that next() can consume. * Determine if the source string still contains characters that next() can consume.
* *
@ -107,7 +107,7 @@ public class JSONTokener {
this.back(); this.back();
return true; return true;
} }
/** /**
* Get the next character in the source string. * Get the next character in the source string.
* *
@ -142,7 +142,7 @@ public class JSONTokener {
this.previous = (char) c; this.previous = (char) c;
return this.previous; return this.previous;
} }
/** /**
* Consume the next character, and check that it matches a specified character. * Consume the next character, and check that it matches a specified character.
* *
@ -159,7 +159,7 @@ public class JSONTokener {
} }
return n; return n;
} }
/** /**
* Get the next n characters. * Get the next n characters.
* *
@ -184,7 +184,7 @@ public class JSONTokener {
} }
return new String(chars); return new String(chars);
} }
/** /**
* Get the next char in the string, skipping whitespace. * Get the next char in the string, skipping whitespace.
* *
@ -200,7 +200,7 @@ public class JSONTokener {
} }
} }
} }
/** /**
* Return the characters up to the next close quote character. Backslash processing is done. The formal JSON format * Return the characters up to the next close quote character. Backslash processing is done. The formal JSON format
* does not allow strings in single quotes, but an implementation is allowed to accept them. * does not allow strings in single quotes, but an implementation is allowed to accept them.
@ -261,7 +261,7 @@ public class JSONTokener {
} }
} }
} }
/** /**
* Get the text up but not including the specified character or the end of line, whichever comes first. * Get the text up but not including the specified character or the end of line, whichever comes first.
* *
@ -282,7 +282,7 @@ public class JSONTokener {
sb.append(c); sb.append(c);
} }
} }
/** /**
* Get the text up but not including one of the specified delimiter characters or the end of line, whichever comes * Get the text up but not including one of the specified delimiter characters or the end of line, whichever comes
* first. * first.
@ -305,7 +305,7 @@ public class JSONTokener {
sb.append(c); sb.append(c);
} }
} }
/** /**
* Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
* JSONObject.NULL object. * JSONObject.NULL object.
@ -347,7 +347,7 @@ public class JSONTokener {
} }
return JSONObject.stringToValue(string); return JSONObject.stringToValue(string);
} }
/** /**
* Skip characters until the next character is the requested character. If the requested character is not found, no * Skip characters until the next character is the requested character. If the requested character is not found, no
* characters are skipped. * characters are skipped.
@ -379,7 +379,7 @@ public class JSONTokener {
this.back(); this.back();
return c; return c;
} }
/** /**
* Make a JSONException to signal a syntax error. * Make a JSONException to signal a syntax error.
* *
@ -390,7 +390,7 @@ public class JSONTokener {
public JSONException syntaxError(final String message) { public JSONException syntaxError(final String message) {
return new JSONException(message + this.toString()); return new JSONException(message + this.toString());
} }
/** /**
* Make a printable string of this JSONTokener. * Make a printable string of this JSONTokener.
* *

28
PlotSquared/src/main/java/com/intellectualcrafters/json/JSONWriter.java
View File

@ -55,7 +55,7 @@ public class JSONWriter {
* The stack top index. A value of 0 indicates that the stack is empty. * The stack top index. A value of 0 indicates that the stack is empty.
*/ */
private int top; private int top;
/** /**
* Make a fresh JSONWriter. It can be used to build one JSON text. * Make a fresh JSONWriter. It can be used to build one JSON text.
*/ */
@ -66,7 +66,7 @@ public class JSONWriter {
this.top = 0; this.top = 0;
this.writer = w; this.writer = w;
} }
/** /**
* Append a value. * Append a value.
* *
@ -97,7 +97,7 @@ public class JSONWriter {
} }
throw new JSONException("Value out of sequence."); throw new JSONException("Value out of sequence.");
} }
/** /**
* Begin appending a new array. All values until the balancing <code>endArray</code> will be appended to this array. * Begin appending a new array. All values until the balancing <code>endArray</code> will be appended to this array.
* The <code>endArray</code> method must be called to mark the array's end. * The <code>endArray</code> method must be called to mark the array's end.
@ -116,7 +116,7 @@ public class JSONWriter {
} }
throw new JSONException("Misplaced array."); throw new JSONException("Misplaced array.");
} }
/** /**
* End something. * End something.
* *
@ -140,7 +140,7 @@ public class JSONWriter {
this.comma = true; this.comma = true;
return this; return this;
} }
/** /**
* End an array. This method most be called to balance calls to <code>array</code>. * End an array. This method most be called to balance calls to <code>array</code>.
* *
@ -151,7 +151,7 @@ public class JSONWriter {
public JSONWriter endArray() throws JSONException { public JSONWriter endArray() throws JSONException {
return this.end('a', ']'); return this.end('a', ']');
} }
/** /**
* End an object. This method most be called to balance calls to <code>object</code>. * End an object. This method most be called to balance calls to <code>object</code>.
* *
@ -162,7 +162,7 @@ public class JSONWriter {
public JSONWriter endObject() throws JSONException { public JSONWriter endObject() throws JSONException {
return this.end('k', '}'); return this.end('k', '}');
} }
/** /**
* Append a key. The key will be associated with the next value. In an object, every value must be preceded by a * Append a key. The key will be associated with the next value. In an object, every value must be preceded by a
* key. * key.
@ -195,7 +195,7 @@ public class JSONWriter {
} }
throw new JSONException("Misplaced key."); throw new JSONException("Misplaced key.");
} }
/** /**
* Begin appending a new object. All keys and values until the balancing <code>endObject</code> will be appended to * Begin appending a new object. All keys and values until the balancing <code>endObject</code> will be appended to
* this object. The <code>endObject</code> method must be called to mark the object's end. * this object. The <code>endObject</code> method must be called to mark the object's end.
@ -217,7 +217,7 @@ public class JSONWriter {
} }
throw new JSONException("Misplaced object."); throw new JSONException("Misplaced object.");
} }
/** /**
* Pop an array or object scope. * Pop an array or object scope.
* *
@ -236,7 +236,7 @@ public class JSONWriter {
this.top -= 1; this.top -= 1;
this.mode = this.top == 0 ? 'd' : this.stack[this.top - 1] == null ? 'a' : 'k'; this.mode = this.top == 0 ? 'd' : this.stack[this.top - 1] == null ? 'a' : 'k';
} }
/** /**
* Push an array or object scope. * Push an array or object scope.
* *
@ -252,7 +252,7 @@ public class JSONWriter {
this.mode = jo == null ? 'a' : 'k'; this.mode = jo == null ? 'a' : 'k';
this.top += 1; this.top += 1;
} }
/** /**
* Append either the value <code>true</code> or the value <code>false</code> . * Append either the value <code>true</code> or the value <code>false</code> .
* *
@ -265,7 +265,7 @@ public class JSONWriter {
public JSONWriter value(final boolean b) throws JSONException { public JSONWriter value(final boolean b) throws JSONException {
return this.append(b ? "true" : "false"); return this.append(b ? "true" : "false");
} }
/** /**
* Append a double value. * Append a double value.
* *
@ -278,7 +278,7 @@ public class JSONWriter {
public JSONWriter value(final double d) throws JSONException { public JSONWriter value(final double d) throws JSONException {
return this.value(new Double(d)); return this.value(new Double(d));
} }
/** /**
* Append a long value. * Append a long value.
* *
@ -291,7 +291,7 @@ public class JSONWriter {
public JSONWriter value(final long l) throws JSONException { public JSONWriter value(final long l) throws JSONException {
return this.append(Long.toString(l)); return this.append(Long.toString(l));
} }
/** /**
* Append an object value. * Append an object value.
* *

22
PlotSquared/src/main/java/com/intellectualcrafters/json/Kim.java
View File

@ -43,7 +43,7 @@ public class Kim {
* The memoization of toString(). * The memoization of toString().
*/ */
private String string = null; private String string = null;
/** /**
* Make a kim from a portion of a byte array. * Make a kim from a portion of a byte array.
* *
@ -70,7 +70,7 @@ public class Kim {
this.hashcode += sum << 16; this.hashcode += sum << 16;
} }
} }
/** /**
* Make a kim from a byte array. * Make a kim from a byte array.
* *
@ -80,7 +80,7 @@ public class Kim {
public Kim(final byte[] bytes, final int length) { public Kim(final byte[] bytes, final int length) {
this(bytes, 0, length); this(bytes, 0, length);
} }
/** /**
* Make a new kim from a substring of an existing kim. The coordinates are in byte units, not character units. * Make a new kim from a substring of an existing kim. The coordinates are in byte units, not character units.
* *
@ -91,7 +91,7 @@ public class Kim {
public Kim(final Kim kim, final int from, final int thru) { public Kim(final Kim kim, final int from, final int thru) {
this(kim.bytes, from, thru); this(kim.bytes, from, thru);
} }
/** /**
* Make a kim from a string. * Make a kim from a string.
* *
@ -173,7 +173,7 @@ public class Kim {
this.hashcode += sum << 16; this.hashcode += sum << 16;
} }
} }
/** /**
* Returns the number of bytes needed to contain the character in Kim format. * Returns the number of bytes needed to contain the character in Kim format.
* *
@ -189,7 +189,7 @@ public class Kim {
} }
return character <= 0x7F ? 1 : character <= 0x3FFF ? 2 : 3; return character <= 0x7F ? 1 : character <= 0x3FFF ? 2 : 3;
} }
/** /**
* Returns the character at the specified index. The index refers to byte values and ranges from 0 to length - 1. * Returns the character at the specified index. The index refers to byte values and ranges from 0 to length - 1.
* The index of the next character is at index + Kim.characterSize(kim.characterAt(index)). * The index of the next character is at index + Kim.characterSize(kim.characterAt(index)).
@ -220,7 +220,7 @@ public class Kim {
} }
throw new JSONException("Bad character at " + at); throw new JSONException("Bad character at " + at);
} }
/** /**
* Copy the contents of this kim to a byte array. * Copy the contents of this kim to a byte array.
* *
@ -233,7 +233,7 @@ public class Kim {
System.arraycopy(this.bytes, 0, bytes, at, this.length); System.arraycopy(this.bytes, 0, bytes, at, this.length);
return at + this.length; return at + this.length;
} }
/** /**
* Two kim objects containing exactly the same bytes in the same order are equal to each other. * Two kim objects containing exactly the same bytes in the same order are equal to each other.
* *
@ -255,7 +255,7 @@ public class Kim {
} }
return java.util.Arrays.equals(this.bytes, that.bytes); return java.util.Arrays.equals(this.bytes, that.bytes);
} }
/** /**
* Get a byte from a kim. * Get a byte from a kim.
* *
@ -271,7 +271,7 @@ public class Kim {
} }
return (this.bytes[at]) & 0xFF; return (this.bytes[at]) & 0xFF;
} }
/** /**
* Returns a hash code value for the kim. * Returns a hash code value for the kim.
*/ */
@ -279,7 +279,7 @@ public class Kim {
public int hashCode() { public int hashCode() {
return this.hashcode; return this.hashcode;
} }
/** /**
* Produce a UTF-16 String from this kim. The number of codepoints in the string will not be greater than the number * Produce a UTF-16 String from this kim. The number of codepoints in the string will not be greater than the number
* of bytes in the kim, although it could be less. * of bytes in the kim, although it could be less.

2
PlotSquared/src/main/java/com/intellectualcrafters/json/Property.java
View File

@ -51,7 +51,7 @@ public class Property {
} }
return jo; return jo;
} }
/** /**
* Converts the JSONObject into a property file object. * Converts the JSONObject into a property file object.
* *

14
PlotSquared/src/main/java/com/intellectualcrafters/json/XML.java
View File

@ -45,7 +45,7 @@ public class XML {
* The Character '/'. * The Character '/'.
*/ */
public static final Character SLASH = '/'; public static final Character SLASH = '/';
/** /**
* Replace special characters with XML escapes: * Replace special characters with XML escapes:
* <p/> * <p/>
@ -87,7 +87,7 @@ public class XML {
} }
return sb.toString(); return sb.toString();
} }
/** /**
* Throw an exception if the string contains whitespace. Whitespace is not allowed in tagNames and attributes. * Throw an exception if the string contains whitespace. Whitespace is not allowed in tagNames and attributes.
* *
@ -107,7 +107,7 @@ public class XML {
} }
} }
} }
/** /**
* Scan the content following the named tag, attaching it to the context. * Scan the content following the named tag, attaching it to the context.
* *
@ -257,7 +257,7 @@ public class XML {
} }
} }
} }
/** /**
* Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string. * Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string.
* This is much less ambitious than JSONObject.stringToValue, especially because it does not attempt to convert plus * This is much less ambitious than JSONObject.stringToValue, especially because it does not attempt to convert plus
@ -299,7 +299,7 @@ public class XML {
} }
return string; return string;
} }
/** /**
* Convert a well-formed (but not necessarily valid) XML string into a JSONObject. Some information may be lost in * Convert a well-formed (but not necessarily valid) XML string into a JSONObject. Some information may be lost in
* this transformation because JSON is a data format and XML is a document format. XML uses elements, attributes, * this transformation because JSON is a data format and XML is a document format. XML uses elements, attributes,
@ -322,7 +322,7 @@ public class XML {
} }
return jo; return jo;
} }
/** /**
* Convert a JSONObject into a well-formed, element-normal XML string. * Convert a JSONObject into a well-formed, element-normal XML string.
* *
@ -335,7 +335,7 @@ public class XML {
public static String toString(final Object object) throws JSONException { public static String toString(final Object object) throws JSONException {
return toString(object, null); return toString(object, null);
} }
/** /**
* Convert a JSONObject into a well-formed, element-normal XML string. * Convert a JSONObject into a well-formed, element-normal XML string.
* *

14
PlotSquared/src/main/java/com/intellectualcrafters/json/XMLTokener.java
View File

@ -19,7 +19,7 @@ public class XMLTokener extends JSONTokener {
entity.put("lt", XML.LT); entity.put("lt", XML.LT);
entity.put("quot", XML.QUOT); entity.put("quot", XML.QUOT);
} }
/** /**
* Construct an XMLTokener from a string. * Construct an XMLTokener from a string.
* *
@ -28,7 +28,7 @@ public class XMLTokener extends JSONTokener {
public XMLTokener(final String s) { public XMLTokener(final String s) {
super(s); super(s);
} }
/** /**
* Get the text in the CDATA block. * Get the text in the CDATA block.
* *
@ -53,7 +53,7 @@ public class XMLTokener extends JSONTokener {
} }
} }
} }
/** /**
* Get the next XML outer token, trimming whitespace. There are two kinds of tokens: the '<' character which begins * Get the next XML outer token, trimming whitespace. There are two kinds of tokens: the '<' character which begins
* a markup tag, and the content text between markup tags. * a markup tag, and the content text between markup tags.
@ -88,7 +88,7 @@ public class XMLTokener extends JSONTokener {
c = next(); c = next();
} }
} }
/** /**
* Return the next entity. These entities are translated to Characters: <code>&amp; &apos; &gt; &lt; * Return the next entity. These entities are translated to Characters: <code>&amp; &apos; &gt; &lt;
* &quot;</code>. * &quot;</code>.
@ -115,7 +115,7 @@ public class XMLTokener extends JSONTokener {
final Object object = entity.get(string); final Object object = entity.get(string);
return object != null ? object : ampersand + string + ";"; return object != null ? object : ampersand + string + ";";
} }
/** /**
* Returns the next XML meta token. This is used for skipping over <!...> and <?...?> structures. * Returns the next XML meta token. This is used for skipping over <!...> and <?...?> structures.
* *
@ -179,7 +179,7 @@ public class XMLTokener extends JSONTokener {
} }
} }
} }
/** /**
* Get the next XML Token. These tokens are found inside of angle brackets. It may be one of these characters: * Get the next XML Token. These tokens are found inside of angle brackets. It may be one of these characters:
* <code>/ > = ! ?</code> or it may be a string wrapped in single quotes or double quotes, or it may be a name. * <code>/ > = ! ?</code> or it may be a string wrapped in single quotes or double quotes, or it may be a name.
@ -258,7 +258,7 @@ public class XMLTokener extends JSONTokener {
} }
} }
} }
/** /**
* Skip characters until past the requested string. If it is not found, we are left at the end of the source with a * Skip characters until past the requested string. If it is not found, we are left at the end of the source with a
* result of false. * result of false.

99
PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
View File

@ -12,10 +12,7 @@ import org.bukkit.World;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; 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.generator.ChunkGenerator;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
@ -68,11 +65,6 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
public class BukkitMain extends JavaPlugin implements Listener, IPlotMain { public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
public static BukkitMain THIS = null; public static BukkitMain THIS = null;
public static PlotSquared MAIN = 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) { public static boolean checkVersion(final int major, final int minor, final int minor2) {
try { try {
@ -91,24 +83,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
return false; 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 @Override
public void onEnable() { public void onEnable() {
THIS = this; THIS = this;
@ -124,16 +99,17 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
} else { } else {
log("&dUsing metrics will allow us to improve the plugin, please consider it :)"); log("&dUsing metrics will allow us to improve the plugin, please consider it :)");
} }
System.out.print("REGISTERING EVENTS");
getServer().getPluginManager().registerEvents(this, this); getServer().getPluginManager().registerEvents(this, this);
} }
@Override @Override
public void onDisable() { public void onDisable() {
MAIN.disable(); MAIN.disable();
MAIN = null; MAIN = null;
THIS = null; THIS = null;
} }
@Override @Override
public void log(String message) { public void log(String message) {
message = message.replaceAll("\u00B2", "2"); message = message.replaceAll("\u00B2", "2");
@ -147,43 +123,44 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
Bukkit.getServer().getConsoleSender().sendMessage(message); Bukkit.getServer().getConsoleSender().sendMessage(message);
} }
} }
@Override @Override
public void disable() { public void disable() {
onDisable(); onDisable();
} }
@Override @Override
public String getVersion() { public String getVersion() {
return this.getDescription().getVersion(); return this.getDescription().getVersion();
} }
@Override @Override
public void registerCommands() { public void registerCommands() {
final MainCommand command = new MainCommand(); new MainCommand();
final BukkitCommand bcmd = new BukkitCommand(); final BukkitCommand bcmd = new BukkitCommand();
final PluginCommand plotCommand = getCommand("plots"); final PluginCommand plotCommand = getCommand("plots");
plotCommand.setExecutor(bcmd); plotCommand.setExecutor(bcmd);
plotCommand.setAliases(Arrays.asList("p", "ps", "plotme", "plot")); plotCommand.setAliases(Arrays.asList("p", "ps", "plotme", "plot"));
plotCommand.setTabCompleter(bcmd); plotCommand.setTabCompleter(bcmd);
} }
@Override @Override
public File getDirectory() { public File getDirectory() {
return getDataFolder(); return getDataFolder();
} }
@Override @Override
public TaskManager getTaskManager() { public TaskManager getTaskManager() {
return new BukkitTaskManager(); return new BukkitTaskManager();
} }
@Override @Override
public void runEntityTask() { public void runEntityTask() {
log(C.PREFIX.s() + "KillAllEntities started."); log(C.PREFIX.s() + "KillAllEntities started.");
TaskManager.runTaskRepeat(new Runnable() { TaskManager.runTaskRepeat(new Runnable() {
long ticked = 0l; long ticked = 0l;
long error = 0l; long error = 0l;
@Override @Override
public void run() { public void run() {
if (this.ticked > 36_000L) { if (this.ticked > 36_000L) {
@ -218,7 +195,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
} }
}, 20); }, 20);
} }
@Override @Override
final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) { final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
if (!PlotSquared.setupPlotWorld(world, id)) { if (!PlotSquared.setupPlotWorld(world, id)) {
@ -226,7 +203,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
} }
return new HybridGen(world); return new HybridGen(world);
} }
@Override @Override
public void registerPlayerEvents() { public void registerPlayerEvents() {
getServer().getPluginManager().registerEvents(new PlayerEvents(), this); getServer().getPluginManager().registerEvents(new PlayerEvents(), this);
@ -234,23 +211,23 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
getServer().getPluginManager().registerEvents(new PlayerEvents_1_8(), this); getServer().getPluginManager().registerEvents(new PlayerEvents_1_8(), this);
} }
} }
@Override @Override
public void registerInventoryEvents() { public void registerInventoryEvents() {
getServer().getPluginManager().registerEvents(new InventoryListener(), this); getServer().getPluginManager().registerEvents(new InventoryListener(), this);
} }
@Override @Override
public void registerPlotPlusEvents() { public void registerPlotPlusEvents() {
PlotPlusListener.startRunnable(this); PlotPlusListener.startRunnable(this);
getServer().getPluginManager().registerEvents(new PlotPlusListener(), this); getServer().getPluginManager().registerEvents(new PlotPlusListener(), this);
} }
@Override @Override
public void registerForceFieldEvents() { public void registerForceFieldEvents() {
getServer().getPluginManager().registerEvents(new ForceFieldListener(), this); getServer().getPluginManager().registerEvents(new ForceFieldListener(), this);
} }
@Override @Override
public void registerWorldEditEvents() { public void registerWorldEditEvents() {
if (getServer().getPluginManager().getPlugin("WorldEdit") != null) { if (getServer().getPluginManager().getPlugin("WorldEdit") != null) {
@ -266,7 +243,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
} }
} }
} }
@Override @Override
public Economy getEconomy() { public Economy getEconomy() {
if ((getServer().getPluginManager().getPlugin("Vault") != null) && getServer().getPluginManager().getPlugin("Vault").isEnabled()) { if ((getServer().getPluginManager().getPlugin("Vault") != null) && getServer().getPluginManager().getPlugin("Vault").isEnabled()) {
@ -278,7 +255,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
} }
return null; return null;
} }
@Override @Override
public BlockManager initBlockManager() { public BlockManager initBlockManager() {
if (checkVersion(1, 8, 0)) { if (checkVersion(1, 8, 0)) {
@ -295,7 +272,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
SetBlockManager.setBlockManager = new SetBlockSlow(); SetBlockManager.setBlockManager = new SetBlockSlow();
} }
} }
AbstractSetBlock.setBlockManager = SetBlockManager.setBlockManager; AbstractSetBlock.setBlockManager = SetBlockManager.setBlockManager;
try { try {
new SendChunk(); new SendChunk();
MainUtil.canSendChunk = true; MainUtil.canSendChunk = true;
@ -304,7 +281,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
} }
return BlockManager.manager = new BukkitUtil(); return BlockManager.manager = new BukkitUtil();
} }
@Override @Override
public boolean initPlotMeConverter() { public boolean initPlotMeConverter() {
try { try {
@ -317,7 +294,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
} }
return false; return false;
} }
@Override @Override
public void getGenerator(final String world, final String name) { public void getGenerator(final String world, final String name) {
final Plugin gen_plugin = Bukkit.getPluginManager().getPlugin(name); final Plugin gen_plugin = Bukkit.getPluginManager().getPlugin(name);
@ -327,7 +304,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
new HybridGen(world); new HybridGen(world);
} }
} }
@Override @Override
public boolean callRemovePlot(final String world, final PlotId id) { public boolean callRemovePlot(final String world, final PlotId id) {
final PlotDeleteEvent event = new PlotDeleteEvent(world, id); final PlotDeleteEvent event = new PlotDeleteEvent(world, id);
@ -338,49 +315,45 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
} }
return true; return true;
} }
@Override @Override
public HybridUtils initHybridUtils() { public HybridUtils initHybridUtils() {
return new BukkitHybridUtils(); return new BukkitHybridUtils();
} }
@Override @Override
public SetupUtils initSetupUtils() { public SetupUtils initSetupUtils() {
return new BukkitSetupUtils(); return new BukkitSetupUtils();
} }
@Override @Override
public UUIDWrapper initUUIDHandler() { public UUIDWrapper initUUIDHandler() {
boolean checkVersion = checkVersion(1, 7, 6); final boolean checkVersion = checkVersion(1, 7, 6);
if (!checkVersion) { if (!checkVersion) {
log(C.PREFIX.s()+" &c[WARN] Titles are disabled - please update your version of Bukkit to support this feature."); log(C.PREFIX.s() + " &c[WARN] Titles are disabled - please update your version of Bukkit to support this feature.");
Settings.TITLES = false; Settings.TITLES = false;
FlagManager.removeFlag(FlagManager.getFlag("titles")); FlagManager.removeFlag(FlagManager.getFlag("titles"));
} } else {
else {
AbstractTitle.TITLE_CLASS = new DefaultTitle(); AbstractTitle.TITLE_CLASS = new DefaultTitle();
} }
if (Settings.OFFLINE_MODE) { if (Settings.OFFLINE_MODE) {
UUIDHandler.uuidWrapper = new OfflineUUIDWrapper(); UUIDHandler.uuidWrapper = new OfflineUUIDWrapper();
Settings.OFFLINE_MODE = true; Settings.OFFLINE_MODE = true;
} } else if (checkVersion) {
else if (checkVersion) {
UUIDHandler.uuidWrapper = new DefaultUUIDWrapper(); UUIDHandler.uuidWrapper = new DefaultUUIDWrapper();
Settings.OFFLINE_MODE = false; Settings.OFFLINE_MODE = false;
} } else {
else {
UUIDHandler.uuidWrapper = new OfflineUUIDWrapper(); UUIDHandler.uuidWrapper = new OfflineUUIDWrapper();
Settings.OFFLINE_MODE = true; Settings.OFFLINE_MODE = true;
} }
if (Settings.OFFLINE_MODE) { if (Settings.OFFLINE_MODE) {
log(C.PREFIX.s()+" &6PlotSquared is using Offline Mode UUIDs either because of user preference, or because you are using an old version of Bukkit"); log(C.PREFIX.s() + " &6PlotSquared is using Offline Mode UUIDs either because of user preference, or because you are using an old version of Bukkit");
} } else {
else { log(C.PREFIX.s() + " &6PlotSquared is using online UUIDs");
log(C.PREFIX.s()+" &6PlotSquared is using online UUIDs");
} }
return UUIDHandler.uuidWrapper; return UUIDHandler.uuidWrapper;
} }
@Override @Override
public AChunkManager initChunkManager() { public AChunkManager initChunkManager() {
return new ChunkManager(); return new ChunkManager();

40
PlotSquared/src/main/java/com/intellectualcrafters/plot/IPlotMain.java
View File

@ -14,44 +14,44 @@ import com.intellectualcrafters.plot.uuid.UUIDWrapper;
public interface IPlotMain { public interface IPlotMain {
public void log(String message); public void log(String message);
public File getDirectory(); public File getDirectory();
public void disable(); public void disable();
public String getVersion(); public String getVersion();
public TaskManager getTaskManager(); public TaskManager getTaskManager();
public void runEntityTask(); public void runEntityTask();
public void registerCommands(); public void registerCommands();
public void registerPlayerEvents(); public void registerPlayerEvents();
public void registerInventoryEvents(); public void registerInventoryEvents();
public void registerPlotPlusEvents(); public void registerPlotPlusEvents();
public void registerForceFieldEvents(); public void registerForceFieldEvents();
public void registerWorldEditEvents(); public void registerWorldEditEvents();
public Economy getEconomy(); public Economy getEconomy();
public BlockManager initBlockManager(); public BlockManager initBlockManager();
public AChunkManager initChunkManager(); public AChunkManager initChunkManager();
public SetupUtils initSetupUtils(); public SetupUtils initSetupUtils();
public HybridUtils initHybridUtils(); public HybridUtils initHybridUtils();
public UUIDWrapper initUUIDHandler(); public UUIDWrapper initUUIDHandler();
public boolean initPlotMeConverter(); public boolean initPlotMeConverter();
public void getGenerator(String world, String name); public void getGenerator(String world, String name);
public boolean callRemovePlot(String world, PlotId id); public boolean callRemovePlot(String world, PlotId id);
} }

70
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
View File

@ -82,11 +82,11 @@ public class PlotSquared {
private static LinkedHashMap<String, HashMap<PlotId, Plot>> plots; private static LinkedHashMap<String, HashMap<PlotId, Plot>> plots;
private static MySQL mySQL; private static MySQL mySQL;
public static Connection connection; public static Connection connection;
public static MySQL getMySQL() { public static MySQL getMySQL() {
return mySQL; return mySQL;
} }
public static void updatePlot(final Plot plot) { public static void updatePlot(final Plot plot) {
final String world = plot.world; final String world = plot.world;
if (!plots.containsKey(world)) { if (!plots.containsKey(world)) {
@ -95,14 +95,14 @@ public class PlotSquared {
plot.hasChanged = true; plot.hasChanged = true;
plots.get(world).put(plot.id, plot); plots.get(world).put(plot.id, plot);
} }
public static PlotWorld getPlotWorld(final String world) { public static PlotWorld getPlotWorld(final String world) {
if (plotworlds.containsKey(world)) { if (plotworlds.containsKey(world)) {
return plotworlds.get(world); return plotworlds.get(world);
} }
return null; return null;
} }
public static void addPlotWorld(final String world, final PlotWorld plotworld, final PlotManager manager) { public static void addPlotWorld(final String world, final PlotWorld plotworld, final PlotManager manager) {
plotworlds.put(world, plotworld); plotworlds.put(world, plotworld);
plotmanagers.put(world, manager); plotmanagers.put(world, manager);
@ -110,21 +110,21 @@ public class PlotSquared {
plots.put(world, new HashMap<PlotId, Plot>()); plots.put(world, new HashMap<PlotId, Plot>());
} }
} }
public static void removePlotWorld(final String world) { public static void removePlotWorld(final String world) {
plots.remove(world); plots.remove(world);
plotmanagers.remove(world); plotmanagers.remove(world);
plotworlds.remove(world); plotworlds.remove(world);
} }
public static HashMap<String, HashMap<PlotId, Plot>> getAllPlotsRaw() { public static HashMap<String, HashMap<PlotId, Plot>> getAllPlotsRaw() {
return plots; return plots;
} }
public static void setAllPlotsRaw(final LinkedHashMap<String, HashMap<PlotId, Plot>> plots) { public static void setAllPlotsRaw(final LinkedHashMap<String, HashMap<PlotId, Plot>> plots) {
PlotSquared.plots = plots; PlotSquared.plots = plots;
} }
public static Set<Plot> getPlots() { public static Set<Plot> getPlots() {
final ArrayList<Plot> newplots = new ArrayList<>(); final ArrayList<Plot> newplots = new ArrayList<>();
for (final HashMap<PlotId, Plot> world : plots.values()) { for (final HashMap<PlotId, Plot> world : plots.values()) {
@ -132,7 +132,7 @@ public class PlotSquared {
} }
return new LinkedHashSet<>(newplots); return new LinkedHashSet<>(newplots);
} }
public static LinkedHashSet<Plot> getPlotsSorted() { public static LinkedHashSet<Plot> getPlotsSorted() {
final ArrayList<Plot> newplots = new ArrayList<>(); final ArrayList<Plot> newplots = new ArrayList<>();
for (final HashMap<PlotId, Plot> world : plots.values()) { for (final HashMap<PlotId, Plot> world : plots.values()) {
@ -140,17 +140,17 @@ public class PlotSquared {
} }
return new LinkedHashSet<>(newplots); return new LinkedHashSet<>(newplots);
} }
public static Set<Plot> getPlots(final String world, final String player) { public static Set<Plot> getPlots(final String world, final String player) {
final UUID uuid = UUIDHandler.getUUID(player); final UUID uuid = UUIDHandler.getUUID(player);
return getPlots(world, uuid); return getPlots(world, uuid);
} }
public static Set<Plot> getPlots(final String world, final PlotPlayer player) { public static Set<Plot> getPlots(final String world, final PlotPlayer player) {
final UUID uuid = player.getUUID(); final UUID uuid = player.getUUID();
return getPlots(world, uuid); return getPlots(world, uuid);
} }
public static Set<Plot> getPlots(final String world, final UUID uuid) { public static Set<Plot> getPlots(final String world, final UUID uuid) {
final ArrayList<Plot> myplots = new ArrayList<>(); final ArrayList<Plot> myplots = new ArrayList<>();
for (final Plot plot : getPlots(world).values()) { for (final Plot plot : getPlots(world).values()) {
@ -162,30 +162,30 @@ public class PlotSquared {
} }
return new HashSet<>(myplots); return new HashSet<>(myplots);
} }
public static boolean isPlotWorld(final String world) { public static boolean isPlotWorld(final String world) {
return (plotworlds.containsKey(world)); return (plotworlds.containsKey(world));
} }
public static PlotManager getPlotManager(final String world) { public static PlotManager getPlotManager(final String world) {
if (plotmanagers.containsKey(world)) { if (plotmanagers.containsKey(world)) {
return plotmanagers.get(world); return plotmanagers.get(world);
} }
return null; return null;
} }
public static String[] getPlotWorldsString() { public static String[] getPlotWorldsString() {
final Set<String> strings = plots.keySet(); final Set<String> strings = plots.keySet();
return strings.toArray(new String[strings.size()]); return strings.toArray(new String[strings.size()]);
} }
public static HashMap<PlotId, Plot> getPlots(final String world) { public static HashMap<PlotId, Plot> getPlots(final String world) {
if (plots.containsKey(world)) { if (plots.containsKey(world)) {
return plots.get(world); return plots.get(world);
} }
return new HashMap<>(); return new HashMap<>();
} }
public static Set<Plot> getPlots(final PlotPlayer player) { public static Set<Plot> getPlots(final PlotPlayer player) {
final UUID uuid = player.getUUID(); final UUID uuid = player.getUUID();
final ArrayList<Plot> myplots = new ArrayList<>(); final ArrayList<Plot> myplots = new ArrayList<>();
@ -202,7 +202,7 @@ public class PlotSquared {
} }
return new HashSet<>(myplots); return new HashSet<>(myplots);
} }
public static boolean removePlot(final String world, final PlotId id, final boolean callEvent) { public static boolean removePlot(final String world, final PlotId id, final boolean callEvent) {
// FIXME plot remove event // FIXME plot remove event
plots.get(world).remove(id); plots.get(world).remove(id);
@ -216,7 +216,7 @@ public class PlotSquared {
} }
return true; return true;
} }
public static void loadWorld(final String world, final PlotGenerator generator) { public static void loadWorld(final String world, final PlotGenerator generator) {
if (getPlotWorld(world) != null) { if (getPlotWorld(world) != null) {
return; return;
@ -303,7 +303,7 @@ public class PlotSquared {
} }
} }
} }
public static boolean setupPlotWorld(final String world, final String id) { public static boolean setupPlotWorld(final String world, final String id) {
if ((id != null) && (id.length() > 0)) { if ((id != null) && (id.length() > 0)) {
// save configuration // save configuration
@ -395,11 +395,11 @@ public class PlotSquared {
} }
return true; return true;
} }
public static Connection getConnection() { public static Connection getConnection() {
return connection; return connection;
} }
public PlotSquared(final IPlotMain imp_class) { public PlotSquared(final IPlotMain imp_class) {
THIS = this; THIS = this;
IMP = imp_class; IMP = imp_class;
@ -461,7 +461,7 @@ public class PlotSquared {
ExpireManager.runTask(); ExpireManager.runTask();
} }
} }
public void disable() { public void disable() {
try { try {
connection.close(); connection.close();
@ -472,11 +472,11 @@ public class PlotSquared {
} }
} }
} }
public static void log(final String message) { public static void log(final String message) {
IMP.log(message); IMP.log(message);
} }
public void setupDatabase() { public void setupDatabase() {
final String[] tables; final String[] tables;
if (Settings.ENABLE_CLUSTERS) { if (Settings.ENABLE_CLUSTERS) {
@ -559,7 +559,7 @@ public class PlotSquared {
return; return;
} }
} }
public static void setupDefaultFlags() { 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> 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> intervalFlags = Arrays.asList("feed", "heal");
@ -610,7 +610,7 @@ public class PlotSquared {
return null; return null;
} }
} }
@Override @Override
public String getValueDesc() { public String getValueDesc() {
return "Flag value must be a gamemode: 'creative' , 'survival' or 'adventure'"; return "Flag value must be a gamemode: 'creative' , 'survival' or 'adventure'";
@ -634,14 +634,14 @@ public class PlotSquared {
return null; return null;
} }
} }
@Override @Override
public String getValueDesc() { public String getValueDesc() {
return "Flag value must be weather type: 'clear' or 'rain'"; return "Flag value must be weather type: 'clear' or 'rain'";
} }
}); });
} }
public static void setupConfig() { public static void setupConfig() {
config.set("version", VERSION); config.set("version", VERSION);
final Map<String, Object> options = new HashMap<>(); final Map<String, Object> options = new HashMap<>();
@ -700,7 +700,7 @@ public class PlotSquared {
Settings.UUID_FROM_DISK = config.getBoolean("uuid.read-from-disk"); Settings.UUID_FROM_DISK = config.getBoolean("uuid.read-from-disk");
Settings.REQUIRE_SELECTION = config.getBoolean("worldedit.require-selection-in-mask"); Settings.REQUIRE_SELECTION = config.getBoolean("worldedit.require-selection-in-mask");
} }
public static void setupConfigs() { public static void setupConfigs() {
final File folder = new File(IMP.getDirectory() + File.separator + "config"); final File folder = new File(IMP.getDirectory() + File.separator + "config");
if (!folder.exists() && !folder.mkdirs()) { if (!folder.exists() && !folder.mkdirs()) {
@ -754,7 +754,7 @@ public class PlotSquared {
e.printStackTrace(); e.printStackTrace();
} }
} }
private static void setupStorage() { private static void setupStorage() {
storage.set("version", VERSION); storage.set("version", VERSION);
final Map<String, Object> options = new HashMap<>(); final Map<String, Object> options = new HashMap<>();
@ -789,7 +789,7 @@ public class PlotSquared {
Settings.CUSTOM_API = config.getBoolean("uuid.api.custom"); Settings.CUSTOM_API = config.getBoolean("uuid.api.custom");
Settings.UUID_FECTHING = config.getBoolean("uuid.fetching"); Settings.UUID_FECTHING = config.getBoolean("uuid.fetching");
} }
public static void showDebug() { public static void showDebug() {
C.COLOR_1 = "&" + (style.getString("color.1")); C.COLOR_1 = "&" + (style.getString("color.1"));
C.COLOR_2 = "&" + (style.getString("color.2")); C.COLOR_2 = "&" + (style.getString("color.2"));
@ -812,7 +812,7 @@ public class PlotSquared {
} }
} }
} }
private static void setupStyle() { private static void setupStyle() {
style.set("version", VERSION); style.set("version", VERSION);
final Map<String, Object> o = new HashMap<>(); final Map<String, Object> o = new HashMap<>();
@ -826,11 +826,11 @@ public class PlotSquared {
} }
} }
} }
public static double getJavaVersion() { public static double getJavaVersion() {
return Double.parseDouble(System.getProperty("java.specification.version")); return Double.parseDouble(System.getProperty("java.specification.version"));
} }
public static Set<String> getPlotWorlds() { public static Set<String> getPlotWorlds() {
return plotworlds.keySet(); return plotworlds.keySet();
} }

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
View File

@ -40,7 +40,7 @@ public class Auto extends SubCommand {
public Auto() { public Auto() {
super("auto", "plots.auto", "Claim the nearest plot", "auto", "a", CommandCategory.CLAIMING, true); super("auto", "plots.auto", "Claim the nearest plot", "auto", "a", CommandCategory.CLAIMING, true);
} }
public static PlotId getNextPlot(final PlotId id, final int step) { public static PlotId getNextPlot(final PlotId id, final int step) {
final int absX = Math.abs(id.x); final int absX = Math.abs(id.x);
final int absY = Math.abs(id.y); final int absY = Math.abs(id.y);
@ -69,7 +69,7 @@ public class Auto extends SubCommand {
return new PlotId(id.x + 1, id.y); return new PlotId(id.x + 1, id.y);
} }
} }
// TODO auto claim a mega plot with schematic // TODO auto claim a mega plot with schematic
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
@ -119,7 +119,7 @@ public class Auto extends SubCommand {
MainUtil.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; return false;
} }
int currentPlots = MainUtil.getPlayerPlotCount(world, plr); final int currentPlots = MainUtil.getPlayerPlotCount(world, plr);
final int diff = currentPlots - MainUtil.getAllowedPlots(plr, currentPlots); final int diff = currentPlots - MainUtil.getAllowedPlots(plr, currentPlots);
if ((diff + (size_x * size_z)) > 0) { if ((diff + (size_x * size_z)) > 0) {
if (diff < 0) { if (diff < 0) {
@ -231,7 +231,7 @@ public class Auto extends SubCommand {
MainUtil.lastPlot.put(worldname, new PlotId(0, 0)); MainUtil.lastPlot.put(worldname, new PlotId(0, 0));
return true; return true;
} }
public PlotId getLastPlot(final String world) { public PlotId getLastPlot(final String world) {
if ((MainUtil.lastPlot == null) || !MainUtil.lastPlot.containsKey(world)) { if ((MainUtil.lastPlot == null) || !MainUtil.lastPlot.containsKey(world)) {
MainUtil.lastPlot.put(world, new PlotId(0, 0)); MainUtil.lastPlot.put(world, new PlotId(0, 0));

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/BukkitCommand.java
View File

@ -19,15 +19,15 @@ import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
* @author Citymonstret * @author Citymonstret
*/ */
public class BukkitCommand implements CommandExecutor, TabCompleter { public class BukkitCommand implements CommandExecutor, TabCompleter {
@Override @Override
public boolean onCommand(CommandSender commandSender, Command command, String commandLabel, String[] args) { public boolean onCommand(final CommandSender commandSender, final Command command, final String commandLabel, final String[] args) {
if (commandSender instanceof Player) { if (commandSender instanceof Player) {
return MainCommand.onCommand(BukkitUtil.getPlayer((Player) commandSender), commandLabel, args); return MainCommand.onCommand(BukkitUtil.getPlayer((Player) commandSender), commandLabel, args);
} }
return MainCommand.onCommand(null, commandLabel, args); return MainCommand.onCommand(null, commandLabel, args);
} }
@Override @Override
public List<String> onTabComplete(final CommandSender commandSender, final Command command, final String s, final String[] strings) { public List<String> onTabComplete(final CommandSender commandSender, final Command command, final String s, final String[] strings) {
if (!(commandSender instanceof Player)) { if (!(commandSender instanceof Player)) {

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Buy.java
View File

@ -41,13 +41,13 @@ public class Buy extends SubCommand {
public Buy() { public Buy() {
super(Command.BUY, "Buy the plot you are standing on", "b", CommandCategory.CLAIMING, true); super(Command.BUY, "Buy the plot you are standing on", "b", CommandCategory.CLAIMING, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (PlotSquared.economy == null) { if (PlotSquared.economy == null) {
return sendMessage(plr, C.ECON_DISABLED); return sendMessage(plr, C.ECON_DISABLED);
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final String world = loc.getWorld(); final String world = loc.getWorld();
if (!PlotSquared.isPlotWorld(world)) { if (!PlotSquared.isPlotWorld(world)) {
return sendMessage(plr, C.NOT_IN_PLOT_WORLD); return sendMessage(plr, C.NOT_IN_PLOT_WORLD);
@ -67,7 +67,7 @@ public class Buy extends SubCommand {
if (plot == null) { if (plot == null) {
return sendMessage(plr, C.NOT_IN_PLOT); return sendMessage(plr, C.NOT_IN_PLOT);
} }
int currentPlots = MainUtil.getPlayerPlotCount(world, plr); final int currentPlots = MainUtil.getPlayerPlotCount(world, plr);
if (currentPlots >= MainUtil.getAllowedPlots(plr, currentPlots)) { if (currentPlots >= MainUtil.getAllowedPlots(plr, currentPlots)) {
return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS); return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
} }
@ -91,14 +91,14 @@ public class Buy extends SubCommand {
price += plotworld.PLOT_PRICE * size; price += plotworld.PLOT_PRICE * size;
initPrice += plotworld.SELL_PRICE * size; initPrice += plotworld.SELL_PRICE * size;
} }
if (PlotSquared.economy != null && price > 0d) { if ((PlotSquared.economy != null) && (price > 0d)) {
if (EconHandler.getBalance(plr) < price) { if (EconHandler.getBalance(plr) < price) {
return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + price); return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + price);
} }
EconHandler.withdrawPlayer(plr, price); EconHandler.withdrawPlayer(plr, price);
sendMessage(plr, C.REMOVED_BALANCE, price + ""); sendMessage(plr, C.REMOVED_BALANCE, price + "");
EconHandler.depositPlayer(UUIDHandler.uuidWrapper.getOfflinePlayer(plot.owner), initPrice); EconHandler.depositPlayer(UUIDHandler.uuidWrapper.getOfflinePlayer(plot.owner), initPrice);
PlotPlayer owner = UUIDHandler.getPlayer(plot.owner); final PlotPlayer owner = UUIDHandler.getPlayer(plot.owner);
if (owner != null) { if (owner != null) {
sendMessage(plr, C.PLOT_SOLD, plot.id + "", plr.getName(), initPrice + ""); sendMessage(plr, C.PLOT_SOLD, plot.id + "", plr.getName(), initPrice + "");
} }

28
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
View File

@ -20,8 +20,6 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import net.milkbowl.vault.economy.Economy;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PlotSquared;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Location;
@ -40,26 +38,26 @@ public class Claim extends SubCommand {
public Claim() { public Claim() {
super(Command.CLAIM, "Claim the current plot you're standing on.", "claim", CommandCategory.CLAIMING, true); super(Command.CLAIM, "Claim the current plot you're standing on.", "claim", CommandCategory.CLAIMING, true);
} }
public static boolean claimPlot(final PlotPlayer 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); return claimPlot(player, plot, teleport, "", auto);
} }
public static boolean claimPlot(final PlotPlayer 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()) { if (plot.hasOwner() || plot.settings.isMerged()) {
return false; return false;
} }
// FIXME claim plot event // FIXME claim plot event
// final PlayerClaimPlotEvent event = new PlayerClaimPlotEvent(player, plot, auto); // final PlayerClaimPlotEvent event = new PlayerClaimPlotEvent(player, plot, auto);
// Bukkit.getPluginManager().callEvent(event); // Bukkit.getPluginManager().callEvent(event);
// boolean result = event.isCancelled(); // boolean result = event.isCancelled();
boolean result = false; final boolean result = false;
if (!result) { if (!result) {
MainUtil.createPlot(player.getUUID(), plot); MainUtil.createPlot(player.getUUID(), plot);
MainUtil.setSign(player.getName(), plot); MainUtil.setSign(player.getName(), plot);
MainUtil.sendMessage(player, C.CLAIMED); MainUtil.sendMessage(player, C.CLAIMED);
Location loc = player.getLocation(); final Location loc = player.getLocation();
if (teleport) { if (teleport) {
MainUtil.teleportPlayer(player, loc, plot); MainUtil.teleportPlayer(player, loc, plot);
} }
@ -83,19 +81,19 @@ public class Claim extends SubCommand {
} }
return !result; return !result;
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
String schematic = ""; String schematic = "";
if (args.length >= 1) { if (args.length >= 1) {
schematic = args[0]; schematic = args[0];
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return sendMessage(plr, C.NOT_IN_PLOT); return sendMessage(plr, C.NOT_IN_PLOT);
} }
int currentPlots = MainUtil.getPlayerPlotCount(loc.getWorld(), plr); final int currentPlots = MainUtil.getPlayerPlotCount(loc.getWorld(), plr);
if (currentPlots >= MainUtil.getAllowedPlots(plr, currentPlots)) { if (currentPlots >= MainUtil.getAllowedPlots(plr, currentPlots)) {
return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS); return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
} }
@ -103,7 +101,7 @@ public class Claim extends SubCommand {
return sendMessage(plr, C.PLOT_IS_CLAIMED); return sendMessage(plr, C.PLOT_IS_CLAIMED);
} }
final PlotWorld world = PlotSquared.getPlotWorld(plot.world); final PlotWorld world = PlotSquared.getPlotWorld(plot.world);
if (PlotSquared.economy != null && world.USE_ECONOMY) { if ((PlotSquared.economy != null) && world.USE_ECONOMY) {
final double cost = world.PLOT_PRICE; final double cost = world.PLOT_PRICE;
if (cost > 0d) { if (cost > 0d) {
if (EconHandler.getBalance(plr) < cost) { if (EconHandler.getBalance(plr) < cost) {

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
View File

@ -34,7 +34,7 @@ public class Clear extends SubCommand {
public Clear() { public Clear() {
super(Command.CLEAR, "Clear a plot", "clear", CommandCategory.ACTIONS, false); super(Command.CLEAR, "Clear a plot", "clear", CommandCategory.ACTIONS, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr == null) { if (plr == null) {
@ -62,12 +62,12 @@ public class Clear extends SubCommand {
} }
return true; return true;
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return sendMessage(plr, C.NOT_IN_PLOT); return sendMessage(plr, C.NOT_IN_PLOT);
} }
if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot( plot))) { if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
return sendMessage(plr, C.UNLINK_REQUIRED); return sendMessage(plr, C.UNLINK_REQUIRED);
} }
if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.clear")) { if (((plot == null) || !plot.hasOwner() || !plot.getOwner().equals(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.clear")) {
@ -75,7 +75,7 @@ public class Clear extends SubCommand {
} }
assert plot != null; assert plot != null;
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
boolean result = MainUtil.clearAsPlayer(plot, false, new Runnable() { final boolean result = MainUtil.clearAsPlayer(plot, false, new Runnable() {
@Override @Override
public void run() { public void run() {
MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start)); MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
View File

@ -45,7 +45,7 @@ public class Cluster extends SubCommand {
public Cluster() { public Cluster() {
super(Command.CLUSTER, "Manage a plot cluster", "cluster", CommandCategory.ACTIONS, true); super(Command.CLUSTER, "Manage a plot cluster", "cluster", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
// list, create, delete, resize, invite, kick, leave, helpers, tp, sethome // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
@ -307,7 +307,7 @@ public class Cluster extends SubCommand {
cluster.invited.add(uuid); cluster.invited.add(uuid);
final String world = plr.getLocation().getWorld(); final String world = plr.getLocation().getWorld();
DBFunc.setInvited(world, cluster, uuid); DBFunc.setInvited(world, cluster, uuid);
PlotPlayer player = UUIDHandler.getPlayer(uuid); final PlotPlayer player = UUIDHandler.getPlayer(uuid);
if (player != null) { if (player != null) {
MainUtil.sendMessage(player, C.CLUSTER_INVITED, cluster.getName()); MainUtil.sendMessage(player, C.CLUSTER_INVITED, cluster.getName());
} }
@ -354,7 +354,7 @@ public class Cluster extends SubCommand {
} }
cluster.invited.remove(uuid); cluster.invited.remove(uuid);
DBFunc.removeInvited(cluster, uuid); DBFunc.removeInvited(cluster, uuid);
PlotPlayer player = UUIDHandler.getPlayer(uuid); final PlotPlayer player = UUIDHandler.getPlayer(uuid);
if (player != null) { if (player != null) {
MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName()); MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName());
} }

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java
View File

@ -87,7 +87,7 @@ public enum Command {
* Permission Node * Permission Node
*/ */
private final CommandPermission permission; private final CommandPermission permission;
/** /**
* @param command Command "name" (/plot [cmd]) * @param command Command "name" (/plot [cmd])
*/ */
@ -96,7 +96,7 @@ public enum Command {
this.alias = command; this.alias = command;
this.permission = new CommandPermission("plots." + command); this.permission = new CommandPermission("plots." + command);
} }
/** /**
* @param command Command "name" (/plot [cmd]) * @param command Command "name" (/plot [cmd])
* @param permission Command Permission Node * @param permission Command Permission Node
@ -106,7 +106,7 @@ public enum Command {
this.permission = permission; this.permission = permission;
this.alias = command; this.alias = command;
} }
/** /**
* @param command Command "name" (/plot [cmd]) * @param command Command "name" (/plot [cmd])
* @param alias Command Alias * @param alias Command Alias
@ -116,7 +116,7 @@ public enum Command {
this.alias = alias; this.alias = alias;
this.permission = new CommandPermission("plots." + command); this.permission = new CommandPermission("plots." + command);
} }
/** /**
* @param command Command "name" (/plot [cmd]) * @param command Command "name" (/plot [cmd])
* @param alias Command Alias * @param alias Command Alias
@ -127,21 +127,21 @@ public enum Command {
this.alias = alias; this.alias = alias;
this.permission = permission; this.permission = permission;
} }
/** /**
* @return command * @return command
*/ */
public String getCommand() { public String getCommand() {
return this.command; return this.command;
} }
/** /**
* @return alias * @return alias
*/ */
public String getAlias() { public String getAlias() {
return this.alias; return this.alias;
} }
/** /**
* @return permission object * @return permission object
* *

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java
View File

@ -33,14 +33,14 @@ public class CommandPermission {
* Permission Node * Permission Node
*/ */
public final String permission; public final String permission;
/** /**
* @param permission Command Permission * @param permission Command Permission
*/ */
public CommandPermission(final String permission) { public CommandPermission(final String permission) {
this.permission = permission.toLowerCase(); this.permission = permission.toLowerCase();
} }
/** /**
* @param player Does the player have the permission? * @param player Does the player have the permission?
* *

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
View File

@ -38,11 +38,11 @@ public class Comment extends SubCommand {
public Comment() { public Comment() {
super(Command.COMMENT, "Comment on a plot", "comment", CommandCategory.ACTIONS, true); super(Command.COMMENT, "Comment on a plot", "comment", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return sendMessage(plr, C.NOT_IN_PLOT); return sendMessage(plr, C.NOT_IN_PLOT);
} }

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
View File

@ -38,11 +38,11 @@ import com.intellectualcrafters.plot.util.MainUtil;
public class Condense extends SubCommand { public class Condense extends SubCommand {
public static boolean TASK = false; public static boolean TASK = false;
public Condense() { public Condense() {
super("condense", "plots.admin", "Condense a plotworld", "condense", "", CommandCategory.DEBUG, false); super("condense", "plots.admin", "Condense a plotworld", "condense", "", CommandCategory.DEBUG, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr != null) { if (plr != null) {
@ -185,7 +185,7 @@ public class Condense extends SubCommand {
MainUtil.sendMessage(plr, "/plot condense " + worldname + " <start|stop|info> [radius]"); MainUtil.sendMessage(plr, "/plot condense " + worldname + " <start|stop|info> [radius]");
return false; return false;
} }
public Set<PlotId> getPlots(final Collection<Plot> plots, final int radius) { public Set<PlotId> getPlots(final Collection<Plot> plots, final int radius) {
final HashSet<PlotId> outside = new HashSet<>(); final HashSet<PlotId> outside = new HashSet<>();
for (final Plot plot : plots) { for (final Plot plot : plots) {
@ -195,7 +195,7 @@ public class Condense extends SubCommand {
} }
return outside; return outside;
} }
public static void sendMessage(final String message) { public static void sendMessage(final String message) {
PlotSquared.log("&3PlotSquared -> Plot condense&8: &7" + message); PlotSquared.log("&3PlotSquared -> Plot condense&8: &7" + message);
} }

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java
View File

@ -33,11 +33,11 @@ public class CreateRoadSchematic extends SubCommand {
public CreateRoadSchematic() { public CreateRoadSchematic() {
super(Command.CREATEROADSCHEMATIC, "Add a road schematic to your world using the road around your current plot", "crs", CommandCategory.DEBUG, true); super(Command.CREATEROADSCHEMATIC, "Add a road schematic to your world using the road around your current plot", "crs", CommandCategory.DEBUG, true);
} }
@Override @Override
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
Location loc = player.getLocation(); final Location loc = player.getLocation();
Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return sendMessage(player, C.NOT_IN_PLOT); return sendMessage(player, C.NOT_IN_PLOT);
} }

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java
View File

@ -24,11 +24,11 @@ import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
*/ */
public class Database extends SubCommand { 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() { public Database() {
super(Command.DATABASE, "Convert/Backup Storage", "database [type] [...details]", CommandCategory.DEBUG, false); super(Command.DATABASE, "Convert/Backup Storage", "database [type] [...details]", CommandCategory.DEBUG, false);
} }
private static boolean sendMessageU(final UUID uuid, final String msg) { private static boolean sendMessageU(final UUID uuid, final String msg) {
if (uuid == null) { if (uuid == null) {
PlotSquared.log(msg); PlotSquared.log(msg);
@ -42,7 +42,7 @@ public class Database extends SubCommand {
} }
return true; return true;
} }
public static void insertPlots(final SQLManager manager, final UUID requester, final Connection c) { public static void insertPlots(final SQLManager manager, final UUID requester, final Connection c) {
final java.util.Set<Plot> plots = PlotSquared.getPlots(); final java.util.Set<Plot> plots = PlotSquared.getPlots();
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {
@ -68,7 +68,7 @@ public class Database extends SubCommand {
} }
}); });
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 1) { if (args.length < 1) {
@ -135,7 +135,7 @@ public class Database extends SubCommand {
} }
return false; return false;
} }
private boolean sendMessage(final PlotPlayer player, final String msg) { private boolean sendMessage(final PlotPlayer player, final String msg) {
if (player == null) { if (player == null) {
PlotSquared.log(msg); PlotSquared.log(msg);

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
View File

@ -31,7 +31,7 @@ public class Debug extends SubCommand {
public Debug() { public Debug() {
super(Command.DEBUG, "Show debug information", "debug [msg]", CommandCategory.DEBUG, false); super(Command.DEBUG, "Show debug information", "debug [msg]", CommandCategory.DEBUG, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if ((args.length > 0) && args[0].equalsIgnoreCase("msg")) { if ((args.length > 0) && args[0].equalsIgnoreCase("msg")) {
@ -55,9 +55,9 @@ public class Debug extends SubCommand {
for (final String world : PlotSquared.getPlotWorlds()) { for (final String world : PlotSquared.getPlotWorlds()) {
worlds.append(world).append(" "); 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 // 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(header);
information.append(getSection(section, "Lag / TPS")); information.append(getSection(section, "Lag / TPS"));
information.append(getLine(line, "Ticks Per Second", Lag.getTPS())); information.append(getLine(line, "Ticks Per Second", Lag.getTPS()));
@ -78,11 +78,11 @@ public class Debug extends SubCommand {
} }
return true; return true;
} }
private String getSection(final String line, final String val) { private String getSection(final String line, final String val) {
return line.replaceAll("%val%", val) + "\n"; return line.replaceAll("%val%", val) + "\n";
} }
private String getLine(final String line, final String var, final Object val) { private String getLine(final String line, final String var, final Object val) {
return line.replaceAll("%var%", var).replaceAll("%val%", "" + val) + "\n"; return line.replaceAll("%var%", var).replaceAll("%val%", "" + val) + "\n";
} }

18
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
View File

@ -47,16 +47,16 @@ public class DebugClaimTest extends SubCommand {
public DebugClaimTest() { 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); 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);
} }
public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport) { public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport) {
return claimPlot(player, plot, teleport, ""); return claimPlot(player, plot, teleport, "");
} }
public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final String schematic) { public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final String schematic) {
// FIXME call claim event // FIXME call claim event
// boolean result = event result // boolean result = event result
boolean result = true; final boolean result = true;
if (!result) { if (!result) {
MainUtil.createPlot(player.getUUID(), plot); MainUtil.createPlot(player.getUUID(), plot);
MainUtil.setSign(player.getName(), plot); MainUtil.setSign(player.getName(), plot);
@ -67,14 +67,14 @@ public class DebugClaimTest extends SubCommand {
} }
return result; return result;
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr == null) { if (plr == null) {
if (args.length < 3) { if (args.length < 3) {
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}"); 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}");
} }
String world = args[0]; final String world = args[0];
if (!BlockManager.manager.isWorld(world) || !PlotSquared.isPlotWorld(world)) { if (!BlockManager.manager.isWorld(world) || !PlotSquared.isPlotWorld(world)) {
return !MainUtil.sendMessage(null, "&cInvalid plot world!"); return !MainUtil.sendMessage(null, "&cInvalid plot world!");
} }
@ -100,12 +100,12 @@ public class DebugClaimTest extends SubCommand {
continue; continue;
} }
final Location loc = manager.getSignLoc(plotworld, plot); final Location loc = manager.getSignLoc(plotworld, plot);
ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4); final ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
boolean result = AChunkManager.manager.loadChunk(world, chunk); final boolean result = AChunkManager.manager.loadChunk(world, chunk);
if (!result) { if (!result) {
continue; continue;
} }
String[] lines = BlockManager.manager.getSign(loc); final String[] lines = BlockManager.manager.getSign(loc);
if (lines != null) { if (lines != null) {
String line = lines[2]; String line = lines[2];
if ((line != null) && (line.length() > 2)) { if ((line != null) && (line.length() > 2)) {

12
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java
View File

@ -27,16 +27,16 @@ import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.AChunkManager;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.Permissions; import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.bukkit.ChunkManager;
import com.intellectualcrafters.plot.util.bukkit.UUIDHandler; import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
public class DebugClear extends SubCommand { public class DebugClear extends SubCommand {
public DebugClear() { public DebugClear() {
super(Command.DEBUGCLEAR, "Clear a plot using a fast experimental algorithm", "debugclear", CommandCategory.DEBUG, false); super(Command.DEBUGCLEAR, "Clear a plot using a fast experimental algorithm", "debugclear", CommandCategory.DEBUG, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr == null) { if (plr == null) {
@ -63,7 +63,7 @@ public class DebugClear extends SubCommand {
return false; return false;
} }
MainUtil.runners.put(plot, 1); MainUtil.runners.put(plot, 1);
ChunkManager.manager.regenerateRegion(pos1, pos2, new Runnable() { AChunkManager.manager.regenerateRegion(pos1, pos2, new Runnable() {
@Override @Override
public void run() { public void run() {
MainUtil.runners.remove(plot); MainUtil.runners.remove(plot);
@ -77,9 +77,9 @@ public class DebugClear extends SubCommand {
} }
return true; return true;
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null || !(PlotSquared.getPlotWorld(loc.getWorld()) instanceof SquarePlotWorld)) { if ((plot == null) || !(PlotSquared.getPlotWorld(loc.getWorld()) instanceof SquarePlotWorld)) {
return sendMessage(plr, C.NOT_IN_PLOT); return sendMessage(plr, C.NOT_IN_PLOT);
} }
if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) { if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
@ -96,7 +96,7 @@ public class DebugClear extends SubCommand {
return false; return false;
} }
MainUtil.runners.put(plot, 1); MainUtil.runners.put(plot, 1);
ChunkManager.manager.regenerateRegion(pos1, pos2, new Runnable() { AChunkManager.manager.regenerateRegion(pos1, pos2, new Runnable() {
@Override @Override
public void run() { public void run() {
MainUtil.runners.remove(plot); MainUtil.runners.remove(plot);

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
View File

@ -48,7 +48,7 @@ public class DebugExec extends SubCommand {
public DebugExec() { public DebugExec() {
super("debugexec", "plots.admin", "Multi-purpose debug command", "debugexec", "exec", CommandCategory.DEBUG, false); super("debugexec", "plots.admin", "Multi-purpose debug command", "debugexec", "exec", CommandCategory.DEBUG, false);
} }
@Override @Override
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
final 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" });
@ -111,8 +111,8 @@ public class DebugExec extends SubCommand {
if (uuid == null) { if (uuid == null) {
return MainUtil.sendMessage(null, "player not found: " + args[1]); return MainUtil.sendMessage(null, "player not found: " + args[1]);
} }
BukkitOfflinePlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid); final BukkitOfflinePlayer op = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid);
if ((op == null) || op.getLastPlayed() == 0) { if ((op == null) || (op.getLastPlayed() == 0)) {
return MainUtil.sendMessage(null, "player hasn't connected before: " + args[1]); return MainUtil.sendMessage(null, "player hasn't connected before: " + args[1]);
} }
final Timestamp stamp = new Timestamp(op.getLastPlayed()); final Timestamp stamp = new Timestamp(op.getLastPlayed());

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java
View File

@ -38,7 +38,7 @@ public class DebugFixFlags extends SubCommand {
public DebugFixFlags() { public DebugFixFlags() {
super(Command.DEBUGFIXFLAGS, "Attempt to fix all flags for a world", "debugclear", CommandCategory.DEBUG, false); super(Command.DEBUGFIXFLAGS, "Attempt to fix all flags for a world", "debugclear", CommandCategory.DEBUG, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr != null) { if (plr != null) {

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java
View File

@ -34,7 +34,7 @@ public class DebugLoadTest extends SubCommand {
public DebugLoadTest() { public DebugLoadTest() {
super(Command.DEBUGLOADTEST, "This debug command will force the reload of all plots in the DB", "debugloadtest", CommandCategory.DEBUG, false); super(Command.DEBUGLOADTEST, "This debug command will force the reload of all plots in the DB", "debugloadtest", CommandCategory.DEBUG, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr == null) { if (plr == null) {

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java
View File

@ -33,16 +33,16 @@ public class DebugRoadRegen extends SubCommand {
public DebugRoadRegen() { public DebugRoadRegen() {
super(Command.DEBUGROADREGEN, "Regenerate all road schematic in your current chunk", "debugroadregen", CommandCategory.DEBUG, true); super(Command.DEBUGROADREGEN, "Regenerate all road schematic in your current chunk", "debugroadregen", CommandCategory.DEBUG, true);
} }
@Override @Override
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
Location loc = player.getLocation(); final Location loc = player.getLocation();
String world = loc.getWorld(); final String world = loc.getWorld();
if (!(PlotSquared.getPlotWorld(world) instanceof HybridPlotWorld)) { if (!(PlotSquared.getPlotWorld(world) instanceof HybridPlotWorld)) {
return sendMessage(player, C.NOT_IN_PLOT_WORLD); return sendMessage(player, C.NOT_IN_PLOT_WORLD);
} }
ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4); final ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
boolean result = HybridUtils.manager.regenerateRoad(world, chunk); final boolean result = HybridUtils.manager.regenerateRoad(world, chunk);
if (result) { if (result) {
MainUtil.update(loc); MainUtil.update(loc);
} }

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java
View File

@ -35,7 +35,7 @@ public class DebugSaveTest extends SubCommand {
public DebugSaveTest() { public DebugSaveTest() {
super(Command.DEBUGSAVETEST, "This debug command will force the recreation of all plots in the DB", "debugsavetest", CommandCategory.DEBUG, false); super(Command.DEBUGSAVETEST, "This debug command will force the recreation of all plots in the DB", "debugsavetest", CommandCategory.DEBUG, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr == null) { if (plr == null) {

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
View File

@ -36,10 +36,10 @@ public class Delete extends SubCommand {
public Delete() { public Delete() {
super(Command.DELETE, "Delete a plot", "delete", CommandCategory.ACTIONS, true); super(Command.DELETE, "Delete a plot", "delete", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);
@ -52,7 +52,7 @@ public class Delete extends SubCommand {
} }
assert plot != null; assert plot != null;
final PlotWorld pWorld = PlotSquared.getPlotWorld(plot.world); final PlotWorld pWorld = PlotSquared.getPlotWorld(plot.world);
if (PlotSquared.economy != null && 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; final double c = pWorld.SELL_PRICE;
if (c > 0d) { if (c > 0d) {
EconHandler.depositPlayer(plr, c); EconHandler.depositPlayer(plr, c);
@ -66,7 +66,7 @@ public class Delete extends SubCommand {
final boolean result = PlotSquared.removePlot(loc.getWorld(), plot.id, true); final boolean result = PlotSquared.removePlot(loc.getWorld(), plot.id, true);
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
if (result) { if (result) {
boolean result2 = MainUtil.clearAsPlayer(plot, true, new Runnable() { final boolean result2 = MainUtil.clearAsPlayer(plot, true, new Runnable() {
@Override @Override
public void run() { public void run() {
MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start)); MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java
View File

@ -36,14 +36,14 @@ public class Denied extends SubCommand {
public Denied() { public Denied() {
super(Command.DENIED, "Manage plot helpers", "denied {add|remove} {player}", CommandCategory.ACTIONS, true); super(Command.DENIED, "Manage plot helpers", "denied {add|remove} {player}", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 2) { if (args.length < 2) {
MainUtil.sendMessage(plr, C.DENIED_NEED_ARGUMENT); MainUtil.sendMessage(plr, C.DENIED_NEED_ARGUMENT);
return true; return true;
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
View File

@ -43,7 +43,7 @@ public class FlagCmd extends SubCommand {
public FlagCmd() { public FlagCmd() {
super(Command.FLAG, "Manage plot flags", "f", CommandCategory.ACTIONS, true); super(Command.FLAG, "Manage plot flags", "f", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
/* /*
@ -57,7 +57,7 @@ public class FlagCmd extends SubCommand {
MainUtil.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; return false;
} }
Location loc = player.getLocation(); final Location loc = player.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
MainUtil.sendMessage(player, C.NOT_IN_PLOT); MainUtil.sendMessage(player, C.NOT_IN_PLOT);

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Help.java
View File

@ -13,7 +13,7 @@ public class Help extends SubCommand {
public Help() { public Help() {
super("help", "", "Get this help menu", "help", "he", SubCommand.CommandCategory.INFO, false); super("help", "", "Get this help menu", "help", "he", SubCommand.CommandCategory.INFO, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
return false; return false;

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java
View File

@ -35,14 +35,14 @@ public class Helpers extends SubCommand {
public Helpers() { public Helpers() {
super(Command.HELPERS, "Manage plot helpers", "helpers {add|remove} {player}", CommandCategory.ACTIONS, true); super(Command.HELPERS, "Manage plot helpers", "helpers {add|remove} {player}", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 2) { if (args.length < 2) {
MainUtil.sendMessage(plr, C.HELPER_NEED_ARGUMENT); MainUtil.sendMessage(plr, C.HELPER_NEED_ARGUMENT);
return true; return true;
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java
View File

@ -34,7 +34,7 @@ public class Home extends SubCommand {
public Home() { public Home() {
super(Command.HOME, "Go to your plot", "home {id|alias}", CommandCategory.TELEPORT, true); super(Command.HOME, "Go to your plot", "home {id|alias}", CommandCategory.TELEPORT, true);
} }
private Plot isAlias(final String a) { private Plot isAlias(final String a) {
for (final Plot p : PlotSquared.getPlots()) { for (final Plot p : PlotSquared.getPlots()) {
if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) { if ((p.settings.getAlias().length() > 0) && p.settings.getAlias().equalsIgnoreCase(a)) {
@ -43,7 +43,7 @@ public class Home extends SubCommand {
} }
return null; return null;
} }
@Override @Override
public boolean execute(final PlotPlayer plr, String... args) { public boolean execute(final PlotPlayer plr, String... args) {
final Plot[] plots = PlotSquared.getPlots(plr).toArray(new Plot[0]); final Plot[] plots = PlotSquared.getPlots(plr).toArray(new Plot[0]);
@ -83,7 +83,7 @@ public class Home extends SubCommand {
return true; return true;
} }
} }
public void teleportPlayer(final PlotPlayer player, final Plot plot) { public void teleportPlayer(final PlotPlayer player, final Plot plot) {
MainUtil.teleportPlayer(player, player.getLocation(), plot); MainUtil.teleportPlayer(player, player.getLocation(), plot);
} }

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
View File

@ -40,7 +40,7 @@ public class Inbox extends SubCommand {
public Inbox() { public Inbox() {
super(Command.INBOX, "Review the comments for a plot", "inbox", CommandCategory.ACTIONS, true); super(Command.INBOX, "Review the comments for a plot", "inbox", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
boolean report = false; boolean report = false;
@ -49,9 +49,9 @@ public class Inbox extends SubCommand {
report = true; report = true;
} }
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null && !report) { if ((plot == null) && !report) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);
} }
if ((plot != null) && !plot.hasOwner()) { if ((plot != null) && !plot.hasOwner()) {

12
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java
View File

@ -47,13 +47,13 @@ public class Info extends SubCommand {
public Info() { public Info() {
super(Command.INFO, "Display plot info", "info", CommandCategory.INFO, false); super(Command.INFO, "Display plot info", "info", CommandCategory.INFO, false);
} }
@Override @Override
public boolean execute(final PlotPlayer player, String... args) { public boolean execute(final PlotPlayer player, String... args) {
Plot plot; Plot plot;
String world; String world;
if (player != null) { if (player != null) {
Location loc = player.getLocation(); final Location loc = player.getLocation();
world = loc.getWorld(); world = loc.getWorld();
if (!PlotSquared.isPlotWorld(world)) { if (!PlotSquared.isPlotWorld(world)) {
MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD); MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD);
@ -129,7 +129,7 @@ public class Info extends SubCommand {
MainUtil.sendMessage(player, info, false); MainUtil.sendMessage(player, info, false);
return true; return true;
} }
private String getCaption(final String string) { private String getCaption(final String string) {
switch (string) { switch (string) {
case "helpers": case "helpers":
@ -156,7 +156,7 @@ public class Info extends SubCommand {
return null; return null;
} }
} }
private String format(String info, final String world, final Plot plot, final PlotPlayer player) { private String format(String info, final String world, final Plot plot, final PlotPlayer player) {
final PlotId id = plot.id; final PlotId id = plot.id;
final PlotId id2 = MainUtil.getTopPlot(plot).id; final PlotId id2 = MainUtil.getTopPlot(plot).id;
@ -191,7 +191,7 @@ public class Info extends SubCommand {
info = info.replaceAll("%desc%", "No description set."); info = info.replaceAll("%desc%", "No description set.");
return info; return info;
} }
private String getPlayerList(final ArrayList<UUID> l) { private String getPlayerList(final ArrayList<UUID> l) {
if ((l == null) || (l.size() < 1)) { if ((l == null) || (l.size() < 1)) {
return " none"; return " none";
@ -207,7 +207,7 @@ public class Info extends SubCommand {
} }
return list.toString(); return list.toString();
} }
private String getPlayerName(final UUID uuid) { private String getPlayerName(final UUID uuid) {
if (uuid == null) { if (uuid == null) {
return "unknown"; return "unknown";

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java
View File

@ -35,7 +35,7 @@ public class Inventory extends SubCommand {
public Inventory() { public Inventory() {
super("inventory", "plots.inventory", "Open a command inventory", "inventory", "inv", CommandCategory.INFO, true); super("inventory", "plots.inventory", "Open a command inventory", "inventory", "inv", CommandCategory.INFO, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
final ArrayList<SubCommand> cmds = new ArrayList<>(); final ArrayList<SubCommand> cmds = new ArrayList<>();
@ -53,7 +53,7 @@ public class Inventory extends SubCommand {
((BukkitPlayer) plr).player.openInventory(inventory); ((BukkitPlayer) plr).player.openInventory(inventory);
return true; return true;
} }
private ItemStack getItem(final SubCommand cmd) { private ItemStack getItem(final SubCommand cmd) {
final ItemStack stack = new ItemStack(Material.COMMAND); final ItemStack stack = new ItemStack(Material.COMMAND);
final ItemMeta meta = stack.getItemMeta(); final ItemMeta meta = stack.getItemMeta();

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
View File

@ -34,10 +34,10 @@ public class Kick extends SubCommand {
public Kick() { public Kick() {
super(Command.KICK, "Kick a player from your plot", "kick", CommandCategory.ACTIONS, true); super(Command.KICK, "Kick a player from your plot", "kick", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);
@ -50,7 +50,7 @@ public class Kick extends SubCommand {
MainUtil.sendMessage(plr, "&c/plot kick <player>"); MainUtil.sendMessage(plr, "&c/plot kick <player>");
return false; return false;
} }
PlotPlayer player = UUIDHandler.getPlayer(args[0]); final PlotPlayer player = UUIDHandler.getPlayer(args[0]);
if (player == null) { if (player == null) {
MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]); MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
return false; return false;

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@ -46,12 +46,12 @@ public class MainCommand {
addAll(Arrays.asList(_subCommands)); addAll(Arrays.asList(_subCommands));
} }
}; };
public static boolean no_permission(final PlotPlayer player, final String permission) { public static boolean no_permission(final PlotPlayer player, final String permission) {
MainUtil.sendMessage(player, C.NO_PERMISSION, permission); MainUtil.sendMessage(player, C.NO_PERMISSION, permission);
return false; return false;
} }
public static List<SubCommand> getCommands(final SubCommand.CommandCategory category, final PlotPlayer player) { public static List<SubCommand> getCommands(final SubCommand.CommandCategory category, final PlotPlayer player) {
final List<SubCommand> cmds = new ArrayList<>(); final List<SubCommand> cmds = new ArrayList<>();
for (final SubCommand c : subCommands) { for (final SubCommand c : subCommands) {
@ -63,7 +63,7 @@ public class MainCommand {
} }
return cmds; return cmds;
} }
public static List<String> helpMenu(final PlotPlayer player, final SubCommand.CommandCategory category, int page) { public static List<String> helpMenu(final PlotPlayer player, final SubCommand.CommandCategory category, int page) {
List<SubCommand> commands; List<SubCommand> commands;
if (category != null) { if (category != null) {
@ -99,11 +99,11 @@ public class MainCommand {
} }
return help; return help;
} }
private static String t(final String s) { private static String t(final String s) {
return MainUtil.colorise('&', s); return MainUtil.colorise('&', s);
} }
public static boolean onCommand(final PlotPlayer player, final String cmd, final String... args) { public static boolean onCommand(final PlotPlayer player, final String cmd, final String... args) {
if (!Permissions.hasPermission(player, PlotSquared.MAIN_PERMISSION)) { if (!Permissions.hasPermission(player, PlotSquared.MAIN_PERMISSION)) {
return no_permission(player, PlotSquared.MAIN_PERMISSION); return no_permission(player, PlotSquared.MAIN_PERMISSION);

17
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@ -22,8 +22,6 @@ package com.intellectualcrafters.plot.commands;
import java.util.ArrayList; import java.util.ArrayList;
import net.milkbowl.vault.economy.Economy;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PlotSquared;
@ -44,11 +42,11 @@ import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
public class Merge extends SubCommand { 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() { public Merge() {
super(Command.MERGE, "Merge the plot you are standing on with another plot.", "merge", CommandCategory.ACTIONS, true); super(Command.MERGE, "Merge the plot you are standing on with another plot.", "merge", CommandCategory.ACTIONS, true);
} }
public static String direction(float yaw) { public static String direction(float yaw) {
yaw = yaw / 90; yaw = yaw / 90;
final int i = Math.round(yaw); final int i = Math.round(yaw);
@ -70,10 +68,10 @@ public class Merge extends SubCommand {
return ""; return "";
} }
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);
@ -107,7 +105,7 @@ public class Merge extends SubCommand {
PlotId bot = MainUtil.getBottomPlot(plot).id; PlotId bot = MainUtil.getBottomPlot(plot).id;
PlotId top = MainUtil.getTopPlot(plot).id; PlotId top = MainUtil.getTopPlot(plot).id;
ArrayList<PlotId> plots; ArrayList<PlotId> plots;
String world = plr.getLocation().getWorld(); final String world = plr.getLocation().getWorld();
switch (direction) { switch (direction) {
case 0: // north = -y case 0: // north = -y
plots = MainUtil.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));
@ -141,11 +139,10 @@ public class Merge extends SubCommand {
} }
} }
final PlotWorld plotWorld = PlotSquared.getPlotWorld(world); final PlotWorld plotWorld = PlotSquared.getPlotWorld(world);
if (PlotSquared.economy != null && plotWorld.USE_ECONOMY) { if ((PlotSquared.economy != null) && plotWorld.USE_ECONOMY) {
double cost = plotWorld.MERGE_PRICE; double cost = plotWorld.MERGE_PRICE;
cost = plots.size() * cost; cost = plots.size() * cost;
if (cost > 0d) { if (cost > 0d) {
final Economy economy = PlotSquared.economy;
if (EconHandler.getBalance(plr) < cost) { if (EconHandler.getBalance(plr) < cost) {
sendMessage(plr, C.CANNOT_AFFORD_MERGE, cost + ""); sendMessage(plr, C.CANNOT_AFFORD_MERGE, cost + "");
return false; return false;
@ -156,7 +153,7 @@ public class Merge extends SubCommand {
} }
//FIXME PlotMergeEvent //FIXME PlotMergeEvent
// boolean result = event.isCancelled(); // boolean result = event.isCancelled();
boolean result = false; final boolean result = false;
if (result) { if (result) {
MainUtil.sendMessage(plr, "&cMerge has been cancelled"); MainUtil.sendMessage(plr, "&cMerge has been cancelled");
return false; return false;

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Move.java
View File

@ -33,7 +33,7 @@ public class Move extends SubCommand {
public Move() { public Move() {
super("debugmove", "plots.admin", "plot moving debug test", "debugmove", "move", CommandCategory.DEBUG, true); super("debugmove", "plots.admin", "plot moving debug test", "debugmove", "move", CommandCategory.DEBUG, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr == null) { if (plr == null) {

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java
View File

@ -39,10 +39,10 @@ public class MusicSubcommand extends SubCommand {
public MusicSubcommand() { public MusicSubcommand() {
super("music", "plots.music", "Play music in plot", "music", "mus", CommandCategory.ACTIONS, true); super("music", "plots.music", "Play music in plot", "music", "mus", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
Location loc = player.getLocation(); final Location loc = player.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(player, C.NOT_IN_PLOT); return !sendMessage(player, C.NOT_IN_PLOT);

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
View File

@ -40,7 +40,7 @@ public class Purge extends SubCommand {
public Purge() { public Purge() {
super("purge", "plots.admin", "Purge all plots for a world", "purge", "", CommandCategory.DEBUG, false); super("purge", "plots.admin", "Purge all plots for a world", "purge", "", CommandCategory.DEBUG, false);
} }
public PlotId getId(final String id) { public PlotId getId(final String id) {
try { try {
final String[] split = id.split(";"); final String[] split = id.split(";");
@ -49,7 +49,7 @@ public class Purge extends SubCommand {
return null; return null;
} }
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr != null) { if (plr != null) {
@ -159,7 +159,7 @@ public class Purge extends SubCommand {
MainUtil.sendMessage(plr, C.PURGE_SYNTAX); MainUtil.sendMessage(plr, C.PURGE_SYNTAX);
return false; return false;
} }
private boolean finishPurge(final int amount) { private boolean finishPurge(final int amount) {
MainUtil.sendMessage(null, C.PURGE_SUCCESS, amount + ""); MainUtil.sendMessage(null, C.PURGE_SUCCESS, amount + "");
return false; return false;

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
View File

@ -36,14 +36,14 @@ public class Rate extends SubCommand {
public Rate() { public Rate() {
super("rate", "plots.rate", "Rate the plot", "rate {0-10}", "rt", CommandCategory.ACTIONS, true); super("rate", "plots.rate", "Rate the plot", "rate {0-10}", "rt", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 1) { if (args.length < 1) {
sendMessage(plr, C.RATING_NOT_VALID); sendMessage(plr, C.RATING_NOT_VALID);
return true; return true;
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java
View File

@ -35,7 +35,7 @@ public class RegenAllRoads extends SubCommand {
public RegenAllRoads() { public RegenAllRoads() {
super(Command.REGENALLROADS, "Regenerate all roads in the map using the set road schematic", "rgar", CommandCategory.DEBUG, false); super(Command.REGENALLROADS, "Regenerate all roads in the map using the set road schematic", "rgar", CommandCategory.DEBUG, false);
} }
@Override @Override
public boolean execute(final PlotPlayer player, final String... args) { public boolean execute(final PlotPlayer player, final String... args) {
if (player != null) { if (player != null) {

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java
View File

@ -30,7 +30,7 @@ public class Reload extends SubCommand {
public Reload() { public Reload() {
super("reload", "plots.admin.command.reload", "Reload configurations", "", "reload", CommandCategory.INFO, false); super("reload", "plots.admin.command.reload", "Reload configurations", "", "reload", CommandCategory.INFO, false);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
try { try {

15
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java
View File

@ -45,12 +45,12 @@ public class Schematic extends SubCommand {
private boolean running = false; private boolean running = false;
private Plot[] plots; private Plot[] plots;
private int task; private int task;
public Schematic() { public Schematic() {
super("schematic", "plots.schematic", "Schematic Command", "schematic {arg}", "sch", CommandCategory.ACTIONS, false); super("schematic", "plots.schematic", "Schematic Command", "schematic {arg}", "sch", CommandCategory.ACTIONS, false);
// TODO command to fetch schematic from worldedit directory // TODO command to fetch schematic from worldedit directory
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 1) { if (args.length < 1) {
@ -75,8 +75,8 @@ public class Schematic extends SubCommand {
break; break;
} }
final Location loc = plr.getLocation(); final Location loc = plr.getLocation();
Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
sendMessage(plr, C.NOT_IN_PLOT); sendMessage(plr, C.NOT_IN_PLOT);
break; break;
} }
@ -163,7 +163,7 @@ public class Schematic extends SubCommand {
sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent"); sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent");
break; break;
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final int l1 = schematic.getSchematicDimension().getX(); final int l1 = schematic.getSchematicDimension().getX();
final int l2 = schematic.getSchematicDimension().getZ(); final int l2 = schematic.getSchematicDimension().getZ();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
@ -236,8 +236,7 @@ public class Schematic extends SubCommand {
break; break;
} }
case "export": case "export":
case "save": case "save": {
{
if (!Permissions.hasPermission(plr, "plots.schematic.save")) { if (!Permissions.hasPermission(plr, "plots.schematic.save")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save"); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save");
return false; return false;
@ -249,7 +248,7 @@ public class Schematic extends SubCommand {
final String world; final String world;
final Plot p2; final Plot p2;
if (plr != null) { if (plr != null) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java
View File

@ -51,15 +51,15 @@ import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
public class Set extends SubCommand { 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() { public Set() {
super(Command.SET, "Set a plot value", "set {arg} {value...}", CommandCategory.ACTIONS, true); super(Command.SET, "Set a plot value", "set {arg} {value...}", CommandCategory.ACTIONS, true);
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);
@ -90,7 +90,7 @@ public class Set extends SubCommand {
} }
if (args[0].equalsIgnoreCase("flag")) { if (args[0].equalsIgnoreCase("flag")) {
if (args.length < 2) { if (args.length < 2) {
String message = StringUtils.join(FlagManager.getFlags(plr), "&c, &6"); final String message = StringUtils.join(FlagManager.getFlags(plr), "&c, &6");
MainUtil.sendMessage(plr, C.NEED_KEY.s().replaceAll("%values%", message)); MainUtil.sendMessage(plr, C.NEED_KEY.s().replaceAll("%values%", message));
return false; return false;
} }
@ -260,11 +260,11 @@ public class Set extends SubCommand {
MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(values)); MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(values));
return false; return false;
} }
private String getString(final String s) { private String getString(final String s) {
return MainUtil.colorise('&', 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) { private String getArgumentList(final String[] strings) {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
for (final String s : strings) { for (final String s : strings) {
@ -272,7 +272,7 @@ public class Set extends SubCommand {
} }
return builder.toString().substring(1, builder.toString().length() - 1); return builder.toString().substring(1, builder.toString().length() - 1);
} }
private String getBiomeList(final String[] biomes) { private String getBiomeList(final String[] biomes) {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
builder.append(MainUtil.colorise('&', C.NOT_VALID_BLOCK_LIST_HEADER.s())); builder.append(MainUtil.colorise('&', C.NOT_VALID_BLOCK_LIST_HEADER.s()));

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
View File

@ -38,7 +38,7 @@ public class SetOwner extends SubCommand {
public SetOwner() { public SetOwner() {
super("setowner", "plots.set.owner", "Set the plot owner", "setowner {player}", "so", CommandCategory.ACTIONS, true); super("setowner", "plots.set.owner", "Set the plot owner", "setowner {player}", "so", CommandCategory.ACTIONS, true);
} }
/* /*
* private UUID getUUID(String string) { OfflinePlayer player = * private UUID getUUID(String string) { OfflinePlayer player =
* Bukkit.getOfflinePlayer(string); return ((player != null) && * Bukkit.getOfflinePlayer(string); return ((player != null) &&
@ -47,10 +47,10 @@ public class SetOwner extends SubCommand {
private UUID getUUID(final String string) { private UUID getUUID(final String string) {
return UUIDHandler.getUUID(string); return UUIDHandler.getUUID(string);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if ((plot == null) || (plot.owner == null)) { if ((plot == null) || (plot.owner == null)) {
MainUtil.sendMessage(plr, C.NOT_IN_PLOT); MainUtil.sendMessage(plr, C.NOT_IN_PLOT);
@ -66,7 +66,7 @@ public class SetOwner extends SubCommand {
} }
final String world = loc.getWorld(); final String world = loc.getWorld();
final PlotId bot = MainUtil.getBottomPlot(plot).id; final PlotId bot = MainUtil.getBottomPlot(plot).id;
final PlotId top = MainUtil.getTopPlot( plot).id; final PlotId top = MainUtil.getTopPlot(plot).id;
final ArrayList<PlotId> plots = MainUtil.getPlotSelectionIds(bot, top); final ArrayList<PlotId> plots = MainUtil.getPlotSelectionIds(bot, top);
for (final PlotId id : plots) { for (final PlotId id : plots) {
final Plot current = PlotSquared.getPlots(world).get(id); final Plot current = PlotSquared.getPlots(world).get(id);

3
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
View File

@ -38,7 +38,7 @@ public class Setup extends SubCommand {
public Setup() { public Setup() {
super("setup", "plots.admin.command.setup", "Plotworld setup command", "setup", "create", CommandCategory.ACTIONS, true); super("setup", "plots.admin.command.setup", "Plotworld setup command", "setup", "create", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
// going through setup // going through setup
@ -180,5 +180,4 @@ public class Setup extends SubCommand {
return false; return false;
} }
} }

18
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java
View File

@ -62,7 +62,7 @@ public abstract class SubCommand {
* Is this a player-online command? * Is this a player-online command?
*/ */
public final boolean isPlayer; public final boolean isPlayer;
/** /**
* @param cmd Command /plot {cmd} <-- That! * @param cmd Command /plot {cmd} <-- That!
* @param permission Permission Node * @param permission Permission Node
@ -81,7 +81,7 @@ public abstract class SubCommand {
this.category = category; this.category = category;
this.isPlayer = isPlayer; this.isPlayer = isPlayer;
} }
/** /**
* @param cmd Command /plot {cmd} <-- That! * @param cmd Command /plot {cmd} <-- That!
* @param permission Permission Node * @param permission Permission Node
@ -100,7 +100,7 @@ public abstract class SubCommand {
this.category = category; this.category = category;
this.isPlayer = isPlayer; this.isPlayer = isPlayer;
} }
/** /**
* @param command Command /plot {cmd} <-- That! * @param command Command /plot {cmd} <-- That!
* @param description Simple description * @param description Simple description
@ -117,7 +117,7 @@ public abstract class SubCommand {
this.category = category; this.category = category;
this.isPlayer = isPlayer; this.isPlayer = isPlayer;
} }
/** /**
* Execute. * Execute.
* *
@ -127,7 +127,7 @@ public abstract class SubCommand {
* @return true on success, false on failure * @return true on success, false on failure
*/ */
public abstract boolean execute(final PlotPlayer plr, final String... args); public abstract boolean execute(final PlotPlayer plr, final String... args);
/** /**
* Execute the command as console * Execute the command as console
* *
@ -136,7 +136,7 @@ public abstract class SubCommand {
public void executeConsole(final String... args) { public void executeConsole(final String... args) {
this.execute(null, args); this.execute(null, args);
} }
/** /**
* Send a message * Send a message
* *
@ -151,7 +151,7 @@ public abstract class SubCommand {
MainUtil.sendMessage(plr, c, args); MainUtil.sendMessage(plr, c, args);
return true; return true;
} }
/** /**
* CommandCategory * CommandCategory
* *
@ -193,7 +193,7 @@ public abstract class SubCommand {
* The category name (Readable) * The category name (Readable)
*/ */
private final String name; private final String name;
/** /**
* Constructor * Constructor
* *
@ -202,7 +202,7 @@ public abstract class SubCommand {
CommandCategory(final String name) { CommandCategory(final String name) {
this.name = name; this.name = name;
} }
@Override @Override
public String toString() { public String toString() {
return this.name; return this.name;

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Swap.java
View File

@ -41,7 +41,7 @@ public class Swap extends SubCommand {
public Swap() { public Swap() {
super(Command.SWAP, "Swap two plots", "switch", CommandCategory.ACTIONS, true); super(Command.SWAP, "Swap two plots", "switch", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 1) { if (args.length < 1) {
@ -49,7 +49,7 @@ public class Swap extends SubCommand {
MainUtil.sendMessage(plr, C.SWAP_SYNTAX); MainUtil.sendMessage(plr, C.SWAP_SYNTAX);
return false; return false;
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java
View File

@ -39,7 +39,7 @@ public class TP extends SubCommand {
public TP() { public TP() {
super(Command.TP, "Teleport to a plot", "tp {alias|id}", CommandCategory.TELEPORT, true); super(Command.TP, "Teleport to a plot", "tp {alias|id}", CommandCategory.TELEPORT, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 1) { if (args.length < 1) {
@ -48,8 +48,8 @@ public class TP extends SubCommand {
} }
final String id = args[0]; final String id = args[0];
PlotId plotid; PlotId plotid;
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
String pworld = loc.getWorld(); final String pworld = loc.getWorld();
String world = pworld; String world = pworld;
if (args.length == 2) { if (args.length == 2) {
if (BlockManager.manager.isWorld(args[1])) { if (BlockManager.manager.isWorld(args[1])) {
@ -74,7 +74,7 @@ public class TP extends SubCommand {
} }
return false; return false;
} }
private Plot isAlias(final String world, String a) { private Plot isAlias(final String world, String a) {
int index = 0; int index = 0;
if (a.contains(";")) { if (a.contains(";")) {

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Target.java
View File

@ -31,10 +31,10 @@ public class Target extends SubCommand {
public Target() { public Target() {
super(Command.TARGET, "Target a plot with your compass", "target <X;Z>", CommandCategory.ACTIONS, true); super(Command.TARGET, "Target a plot with your compass", "target <X;Z>", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location ploc = plr.getLocation(); final Location ploc = plr.getLocation();
if (!PlotSquared.isPlotWorld(ploc.getWorld())) { if (!PlotSquared.isPlotWorld(ploc.getWorld())) {
MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD); MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return false; return false;

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Template.java
View File

@ -36,14 +36,14 @@ public class Template extends SubCommand {
public Template() { public Template() {
super("template", "plots.admin", "Create or use a world template", "template", "", CommandCategory.DEBUG, true); super("template", "plots.admin", "Create or use a world template", "template", "", CommandCategory.DEBUG, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length != 2) { if (args.length != 2) {
MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template <import|export> <world>"); MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template <import|export> <world>");
return false; return false;
} }
String world = args[1]; final String world = args[1];
final PlotWorld plotworld = PlotSquared.getPlotWorld(world); final PlotWorld plotworld = PlotSquared.getPlotWorld(world);
if (!BlockManager.manager.isWorld(world) || (plotworld == null)) { if (!BlockManager.manager.isWorld(world) || (plotworld == null)) {
MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD); MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD);
@ -63,7 +63,7 @@ public class Template extends SubCommand {
// TODO allow world created based on these packaged files // TODO allow world created based on these packaged files
return true; return true;
} }
public void gzipIt(final String output, final String input) { public void gzipIt(final String output, final String input) {
final byte[] buffer = new byte[1024]; final byte[] buffer = new byte[1024];
try { try {

27
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java
View File

@ -39,16 +39,15 @@ import com.intellectualcrafters.plot.util.AChunkManager;
import com.intellectualcrafters.plot.util.BlockManager; import com.intellectualcrafters.plot.util.BlockManager;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.bukkit.ChunkManager;
public class Trim extends SubCommand { public class Trim extends SubCommand {
public static boolean TASK = false; public static boolean TASK = false;
private static int TASK_ID = 0; private static int TASK_ID = 0;
public Trim() { public Trim() {
super("trim", "plots.admin", "Delete unmodified portions of your plotworld", "trim", "", CommandCategory.DEBUG, false); super("trim", "plots.admin", "Delete unmodified portions of your plotworld", "trim", "", CommandCategory.DEBUG, false);
} }
public PlotId getId(final String id) { public PlotId getId(final String id) {
try { try {
final String[] split = id.split(";"); final String[] split = id.split(";");
@ -57,7 +56,7 @@ public class Trim extends SubCommand {
return null; return null;
} }
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (plr != null) { if (plr != null) {
@ -106,7 +105,7 @@ public class Trim extends SubCommand {
}); });
return true; return true;
} }
public static boolean getBulkRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) { public static boolean getBulkRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) {
if (Trim.TASK) { if (Trim.TASK) {
return false; return false;
@ -160,12 +159,12 @@ public class Trim extends SubCommand {
Trim.TASK = true; Trim.TASK = true;
return true; return true;
} }
public static boolean getTrimRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) { public static boolean getTrimRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) {
if (Trim.TASK) { if (Trim.TASK) {
return false; return false;
} }
final long startOld = System.currentTimeMillis(); System.currentTimeMillis();
sendMessage("Collecting region data..."); sendMessage("Collecting region data...");
final ArrayList<Plot> plots = new ArrayList<>(); final ArrayList<Plot> plots = new ArrayList<>();
plots.addAll(PlotSquared.getPlots(world).values()); plots.addAll(PlotSquared.getPlots(world).values());
@ -191,25 +190,25 @@ public class Trim extends SubCommand {
final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id); final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id);
final Location pos3 = new Location(world, pos1.getX(), 64, pos2.getZ()); final Location pos3 = new Location(world, pos1.getX(), 64, pos2.getZ());
final Location pos4 = new Location(world, pos2.getX(), 64, pos1.getZ()); final Location pos4 = new Location(world, pos2.getX(), 64, pos1.getZ());
chunks.remove(ChunkManager.getChunkChunk(pos1)); chunks.remove(AChunkManager.getChunkChunk(pos1));
chunks.remove(ChunkManager.getChunkChunk(pos2)); chunks.remove(AChunkManager.getChunkChunk(pos2));
chunks.remove(ChunkManager.getChunkChunk(pos3)); chunks.remove(AChunkManager.getChunkChunk(pos3));
chunks.remove(ChunkManager.getChunkChunk(pos4)); chunks.remove(AChunkManager.getChunkChunk(pos4));
} }
} }
}, 20); }, 20);
Trim.TASK = true; Trim.TASK = true;
return true; return true;
} }
public static ArrayList<Plot> expired = null; public static ArrayList<Plot> expired = null;
public static void deleteChunks(final String world, final ArrayList<ChunkLoc> chunks) { public static void deleteChunks(final String world, final ArrayList<ChunkLoc> chunks) {
for (final ChunkLoc loc : chunks) { for (final ChunkLoc loc : chunks) {
AChunkManager.manager.deleteRegionFile(world, loc); AChunkManager.manager.deleteRegionFile(world, loc);
} }
} }
public static void sendMessage(final String message) { public static void sendMessage(final String message) {
PlotSquared.log("&3PlotSquared -> World trim&8: &7" + message); PlotSquared.log("&3PlotSquared -> World trim&8: &7" + message);
} }

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java
View File

@ -36,14 +36,14 @@ public class Trusted extends SubCommand {
public Trusted() { public Trusted() {
super(Command.TRUSTED, "Manage trusted users for a plot", "trusted {add|remove} {player}", CommandCategory.ACTIONS, true); super(Command.TRUSTED, "Manage trusted users for a plot", "trusted {add|remove} {player}", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 2) { if (args.length < 2) {
MainUtil.sendMessage(plr, C.TRUSTED_NEED_ARGUMENT); MainUtil.sendMessage(plr, C.TRUSTED_NEED_ARGUMENT);
return true; return true;
} }
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);

9
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
View File

@ -20,8 +20,6 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands; package com.intellectualcrafters.plot.commands;
import net.milkbowl.vault.economy.Economy;
import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.PlotSquared;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
@ -38,10 +36,10 @@ public class Unclaim extends SubCommand {
public Unclaim() { public Unclaim() {
super(Command.UNCLAIM, "Unclaim a plot", "unclaim", CommandCategory.ACTIONS, true); super(Command.UNCLAIM, "Unclaim a plot", "unclaim", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);
@ -54,10 +52,9 @@ public class Unclaim extends SubCommand {
} }
assert plot != null; assert plot != null;
final PlotWorld pWorld = PlotSquared.getPlotWorld(plot.world); final PlotWorld pWorld = PlotSquared.getPlotWorld(plot.world);
if (PlotSquared.economy != null && pWorld.USE_ECONOMY) { if ((PlotSquared.economy != null) && pWorld.USE_ECONOMY) {
final double c = pWorld.SELL_PRICE; final double c = pWorld.SELL_PRICE;
if (c > 0d) { if (c > 0d) {
final Economy economy = PlotSquared.economy;
EconHandler.depositPlayer(plr, c); EconHandler.depositPlayer(plr, c);
sendMessage(plr, C.ADDED_BALANCE, c + ""); sendMessage(plr, C.ADDED_BALANCE, c + "");
} }

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java
View File

@ -44,10 +44,10 @@ public class Unlink extends SubCommand {
public Unlink() { public Unlink() {
super(Command.UNLINK, "Unlink a mega-plot", "unlink", CommandCategory.ACTIONS, true); super(Command.UNLINK, "Unlink a mega-plot", "unlink", CommandCategory.ACTIONS, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {
return !sendMessage(plr, C.NOT_IN_PLOT); return !sendMessage(plr, C.NOT_IN_PLOT);
@ -66,9 +66,9 @@ public class Unlink extends SubCommand {
MainUtil.sendMessage(plr, "&6Plots unlinked successfully!"); MainUtil.sendMessage(plr, "&6Plots unlinked successfully!");
return true; return true;
} }
public static boolean unlinkPlot(final Plot plot) { public static boolean unlinkPlot(final Plot plot) {
String world = plot.world; final String world = plot.world;
final PlotId pos1 = MainUtil.getBottomPlot(plot).id; final PlotId pos1 = MainUtil.getBottomPlot(plot).id;
final PlotId pos2 = MainUtil.getTopPlot(plot).id; final PlotId pos2 = MainUtil.getTopPlot(plot).id;
final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(pos1, pos2); final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(pos1, pos2);

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
View File

@ -35,7 +35,7 @@ public class Visit extends SubCommand {
public Visit() { public Visit() {
super("visit", "plots.visit", "Visit someones plot", "visit {player} [#]", "v", CommandCategory.TELEPORT, true); super("visit", "plots.visit", "Visit someones plot", "visit {player} [#]", "v", CommandCategory.TELEPORT, true);
} }
public List<Plot> getPlots(final UUID uuid) { public List<Plot> getPlots(final UUID uuid) {
final List<Plot> plots = new ArrayList<>(); final List<Plot> plots = new ArrayList<>();
for (final Plot p : PlotSquared.getPlots()) { for (final Plot p : PlotSquared.getPlots()) {
@ -45,7 +45,7 @@ public class Visit extends SubCommand {
} }
return plots; return plots;
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 1) { if (args.length < 1) {

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java
View File

@ -30,7 +30,7 @@ public class WE_Anywhere extends SubCommand {
public WE_Anywhere() { public WE_Anywhere() {
super("weanywhere", "plots.weanywhere", "Force bypass of WorldEdit", "weanywhere", "wea", CommandCategory.DEBUG, true); super("weanywhere", "plots.weanywhere", "Force bypass of WorldEdit", "weanywhere", "wea", CommandCategory.DEBUG, true);
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (PlotSquared.worldEdit == null) { if (PlotSquared.worldEdit == null) {

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java
View File

@ -41,7 +41,7 @@ public class list extends SubCommand {
public list() { public list() {
super(Command.LIST, "List all plots", "list {mine|shared|all|world|forsale}", CommandCategory.INFO, false); super(Command.LIST, "List all plots", "list {mine|shared|all|world|forsale}", CommandCategory.INFO, false);
} }
private static String getName(final UUID id) { private static String getName(final UUID id) {
if (id == null) { if (id == null) {
return "none"; return "none";
@ -52,7 +52,7 @@ public class list extends SubCommand {
} }
return name; return name;
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
if (args.length < 1) { if (args.length < 1) {
@ -168,7 +168,7 @@ public class list extends SubCommand {
return false; return false;
} }
} }
private String getArgumentList(final String[] strings) { private String getArgumentList(final String[] strings) {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
for (final String s : strings) { for (final String s : strings) {

10
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/plugin.java
View File

@ -33,11 +33,11 @@ import com.intellectualcrafters.plot.util.TaskManager;
public class plugin extends SubCommand { public class plugin extends SubCommand {
public static String downloads, version; public static String downloads, version;
public plugin() { public plugin() {
super("plugin", "plots.use", "Show plugin information", "plugin", "version", CommandCategory.INFO, false); super("plugin", "plots.use", "Show plugin information", "plugin", "version", CommandCategory.INFO, false);
} }
public static void setup() { public static void setup() {
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {
@Override @Override
@ -61,7 +61,7 @@ public class plugin extends SubCommand {
} }
}, 200); }, 200);
} }
private static String convertToNumericString(final String str, final boolean dividers) { private static String convertToNumericString(final String str, final boolean dividers) {
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
for (final char c : str.toCharArray()) { for (final char c : str.toCharArray()) {
@ -73,7 +73,7 @@ public class plugin extends SubCommand {
} }
return builder.toString(); return builder.toString();
} }
private static String getInfo(final String link) throws Exception { private static String getInfo(final String link) throws Exception {
final URLConnection connection = new URL(link).openConnection(); final URLConnection connection = new URL(link).openConnection();
connection.addRequestProperty("User-Agent", "Mozilla/4.0"); connection.addRequestProperty("User-Agent", "Mozilla/4.0");
@ -85,7 +85,7 @@ public class plugin extends SubCommand {
reader.close(); reader.close();
return document; return document;
} }
@Override @Override
public boolean execute(final PlotPlayer plr, final String... args) { public boolean execute(final PlotPlayer plr, final String... args) {
TaskManager.runTaskAsync(new Runnable() { TaskManager.runTaskAsync(new Runnable() {

18
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -469,7 +469,7 @@ public enum C {
* Should the string be prefixed? * Should the string be prefixed?
*/ */
private boolean prefix; private boolean prefix;
/** /**
* Constructor for custom strings. * Constructor for custom strings.
*/ */
@ -478,7 +478,7 @@ public enum C {
* use setCustomString(); * use setCustomString();
*/ */
} }
/** /**
* Constructor * Constructor
* *
@ -492,7 +492,7 @@ public enum C {
} }
this.prefix = prefix; this.prefix = prefix;
} }
/** /**
* Constructor * Constructor
* *
@ -501,7 +501,7 @@ public enum C {
C(final String d) { C(final String d) {
this(d, true); this(d, true);
} }
public static void setupTranslations() { public static void setupTranslations() {
manager = new TranslationManager(); manager = new TranslationManager();
defaultFile = new YamlTranslationFile(BukkitTranslation.getParent(), lang, "PlotSquared", manager).read(); defaultFile = new YamlTranslationFile(BukkitTranslation.getParent(), lang, "PlotSquared", manager).read();
@ -510,7 +510,7 @@ public enum C {
manager.addTranslationObject(new TranslationObject(c.toString(), c.d, "", "")); manager.addTranslationObject(new TranslationObject(c.toString(), c.d, "", ""));
} }
} }
public static void saveTranslations() { public static void saveTranslations() {
try { try {
manager.saveAll(defaultFile).saveFile(defaultFile); manager.saveAll(defaultFile).saveFile(defaultFile);
@ -518,7 +518,7 @@ public enum C {
e.printStackTrace(); e.printStackTrace();
} }
} }
/** /**
* Get the default string * Get the default string
* *
@ -527,7 +527,7 @@ public enum C {
public String d() { public String d() {
return this.d; return this.d;
} }
/** /**
* Get translated if exists * Get translated if exists
* *
@ -549,11 +549,11 @@ public enum C {
* return this.s.replace("\\n", "\n"); * return this.s.replace("\\n", "\n");
*/ */
} }
public boolean usePrefix() { public boolean usePrefix() {
return this.prefix; return this.prefix;
} }
/** /**
* @return translated and color decoded * @return translated and color decoded
* *

40
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
View File

@ -37,7 +37,7 @@ public class Configuration {
public boolean validateValue(final String string) { public boolean validateValue(final String string) {
return true; return true;
} }
@Override @Override
public Object parseString(final String string) { public Object parseString(final String string) {
return string; return string;
@ -48,7 +48,7 @@ public class Configuration {
public boolean validateValue(final String string) { public boolean validateValue(final String string) {
return true; return true;
} }
@Override @Override
public Object parseString(final String string) { public Object parseString(final String string) {
return string.split(","); return string.split(",");
@ -64,7 +64,7 @@ public class Configuration {
return false; return false;
} }
} }
@Override @Override
public Object parseString(final String string) { public Object parseString(final String string) {
return Integer.parseInt(string); return Integer.parseInt(string);
@ -80,7 +80,7 @@ public class Configuration {
return false; return false;
} }
} }
@Override @Override
public Object parseString(final String string) { public Object parseString(final String string) {
return Boolean.parseBoolean(string); return Boolean.parseBoolean(string);
@ -96,7 +96,7 @@ public class Configuration {
return false; return false;
} }
} }
@Override @Override
public Object parseString(final String string) { public Object parseString(final String string) {
return Double.parseDouble(string); return Double.parseDouble(string);
@ -106,7 +106,7 @@ public class Configuration {
@Override @Override
public boolean validateValue(final String string) { public boolean validateValue(final String string) {
try { try {
int biome = BlockManager.manager.getBiomeFromString(string.toUpperCase()); final int biome = BlockManager.manager.getBiomeFromString(string.toUpperCase());
if (biome == -1) { if (biome == -1) {
return false; return false;
} }
@ -115,7 +115,7 @@ public class Configuration {
return false; return false;
} }
} }
@Override @Override
public Object parseString(final String string) { public Object parseString(final String string) {
if (validateValue(string)) { if (validateValue(string)) {
@ -123,7 +123,7 @@ public class Configuration {
} }
return "FOREST"; return "FOREST";
} }
@Override @Override
public Object parseObject(final Object object) { public Object parseObject(final Object object) {
return object.toString(); return object.toString();
@ -145,7 +145,7 @@ public class Configuration {
return false; return false;
} }
} }
@Override @Override
public Object parseString(final String string) { public Object parseString(final String string) {
if (string.contains(":")) { if (string.contains(":")) {
@ -155,7 +155,7 @@ public class Configuration {
return new PlotBlock(Short.parseShort(string), (byte) 0); return new PlotBlock(Short.parseShort(string), (byte) 0);
} }
} }
@Override @Override
public Object parseObject(final Object object) { public Object parseObject(final Object object) {
return object; return object;
@ -184,7 +184,7 @@ public class Configuration {
return false; return false;
} }
} }
@Override @Override
public Object parseString(final String string) { public Object parseString(final String string) {
final String[] blocks = string.split(","); final String[] blocks = string.split(",");
@ -223,20 +223,20 @@ public class Configuration {
} }
return parsedvalues.toArray(new PlotBlock[parsedvalues.size()]); return parsedvalues.toArray(new PlotBlock[parsedvalues.size()]);
} }
@Override @Override
public Object parseObject(final Object object) { public Object parseObject(final Object object) {
return object; return object;
} }
}; };
public static int gcd(final int a, final int b) { public static int gcd(final int a, final int b) {
if (b == 0) { if (b == 0) {
return a; return a;
} }
return gcd(b, a % b); return gcd(b, a % b);
} }
private static int gcd(final int[] a) { private static int gcd(final int[] a) {
int result = a[0]; int result = a[0];
for (int i = 1; i < a.length; i++) { for (int i = 1; i < a.length; i++) {
@ -244,27 +244,27 @@ public class Configuration {
} }
return result; return result;
} }
/** /**
* Create your own SettingValue object to make the management of plotworld configuration easier * Create your own SettingValue object to make the management of plotworld configuration easier
*/ */
public static abstract class SettingValue { public static abstract class SettingValue {
private final String type; private final String type;
public SettingValue(final String type) { public SettingValue(final String type) {
this.type = type; this.type = type;
} }
public String getType() { public String getType() {
return this.type; return this.type;
} }
public Object parseObject(final Object object) { public Object parseObject(final Object object) {
return object; return object;
} }
public abstract Object parseString(final String string); public abstract Object parseString(final String string);
public abstract boolean validateValue(final String string); public abstract boolean validateValue(final String string);
} }
} }

16
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java
View File

@ -40,7 +40,7 @@ public class ConfigurationNode {
private final String description; private final String description;
private final SettingValue type; private final SettingValue type;
private Object value; private Object value;
public ConfigurationNode(final String constant, final Object default_value, final String description, final SettingValue type, final boolean required) { public ConfigurationNode(final String constant, final Object default_value, final String description, final SettingValue type, final boolean required) {
this.constant = constant; this.constant = constant;
this.default_value = default_value; this.default_value = default_value;
@ -48,11 +48,11 @@ public class ConfigurationNode {
this.value = default_value; this.value = default_value;
this.type = type; this.type = type;
} }
public SettingValue getType() { public SettingValue getType() {
return this.type; return this.type;
} }
public boolean isValid(final String string) { public boolean isValid(final String string) {
try { try {
final Object result = this.type.parseString(string); final Object result = this.type.parseString(string);
@ -61,7 +61,7 @@ public class ConfigurationNode {
return false; return false;
} }
} }
public boolean setValue(final String string) { public boolean setValue(final String string) {
if (!this.type.validateValue(string)) { if (!this.type.validateValue(string)) {
return false; return false;
@ -69,7 +69,7 @@ public class ConfigurationNode {
this.value = this.type.parseString(string); this.value = this.type.parseString(string);
return true; return true;
} }
public Object getValue() { public Object getValue() {
if (this.value instanceof String[]) { if (this.value instanceof String[]) {
return Arrays.asList((String[]) this.value); return Arrays.asList((String[]) this.value);
@ -84,18 +84,18 @@ public class ConfigurationNode {
} }
return this.value; return this.value;
} }
public String getConstant() { public String getConstant() {
return this.constant; return this.constant;
} }
public Object getDefaultValue() { public Object getDefaultValue() {
if (this.default_value instanceof Object[]) { if (this.default_value instanceof Object[]) {
return StringUtils.join((Object[]) this.default_value, ","); return StringUtils.join((Object[]) this.default_value, ",");
} }
return this.default_value; return this.default_value;
} }
public String getDescription() { public String getDescription() {
return this.description; return this.description;
} }

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Settings.java
View File

@ -136,7 +136,7 @@ public class Settings {
* Use offline mode storage * Use offline mode storage
*/ */
public static boolean OFFLINE_MODE = false; public static boolean OFFLINE_MODE = false;
/** /**
* Database settings * Database settings
* *
@ -147,9 +147,9 @@ public class Settings {
* MongoDB enabled? * MongoDB enabled?
*/ */
public static boolean USE_MONGO = false; /* public static boolean USE_MONGO = false; /*
* TODO: Implement Mongo * TODO: Implement Mongo
* @Brandon * @Brandon
*/ */
/** /**
* SQLite enabled? * SQLite enabled?
*/ */

84
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java
View File

@ -45,7 +45,7 @@ public interface AbstractDB {
* The UUID that will count as everyone * The UUID that will count as everyone
*/ */
public UUID everyone = UUID.fromString("1-1-3-3-7"); public UUID everyone = UUID.fromString("1-1-3-3-7");
/** /**
* Set Plot owner * Set Plot owner
* *
@ -53,28 +53,28 @@ public interface AbstractDB {
* @param uuid The uuid of the new owner * @param uuid The uuid of the new owner
*/ */
public void setOwner(final Plot plot, final UUID uuid); public void setOwner(final Plot plot, final UUID uuid);
/** /**
* Create all settings, and create default helpers, trusted + denied lists * Create all settings, and create default helpers, trusted + denied lists
* *
* @param plots Plots for which the default table entries should be created * @param plots Plots for which the default table entries should be created
*/ */
public void createAllSettingsAndHelpers(final ArrayList<Plot> plots); public void createAllSettingsAndHelpers(final ArrayList<Plot> plots);
/** /**
* Create a plot * Create a plot
* *
* @param plots Plots that should be created * @param plots Plots that should be created
*/ */
public void createPlots(final ArrayList<Plot> plots); public void createPlots(final ArrayList<Plot> plots);
/** /**
* Create a plot * Create a plot
* *
* @param plot That should be created * @param plot That should be created
*/ */
public void createPlot(final Plot plot); public void createPlot(final Plot plot);
/** /**
* Create tables * Create tables
* *
@ -83,16 +83,16 @@ public interface AbstractDB {
* @throws SQLException If the database manager is unable to create the tables * @throws SQLException If the database manager is unable to create the tables
*/ */
public void createTables(final String database, final boolean add_constraint) throws Exception; public void createTables(final String database, final boolean add_constraint) throws Exception;
/** /**
* Delete a plot * Delete a plot
* *
* @param plot Plot that should be deleted * @param plot Plot that should be deleted
*/ */
public void delete(final String world, final Plot plot); public void delete(final String world, final Plot plot);
public void delete(final PlotCluster cluster); public void delete(final PlotCluster cluster);
/** /**
* Create plot settings * Create plot settings
* *
@ -100,7 +100,7 @@ public interface AbstractDB {
* @param plot Plot Object * @param plot Plot Object
*/ */
public void createPlotSettings(final int id, final Plot plot); public void createPlotSettings(final int id, final Plot plot);
/** /**
* Get the table entry ID * Get the table entry ID
* *
@ -110,7 +110,7 @@ public interface AbstractDB {
* @return Integer = Plot Entry Id * @return Integer = Plot Entry Id
*/ */
public int getId(final String world, final PlotId id2); public int getId(final String world, final PlotId id2);
/** /**
* Get the id of a given plot cluster * Get the id of a given plot cluster
* *
@ -121,17 +121,17 @@ public interface AbstractDB {
* @return Integer = Cluster Entry Id * @return Integer = Cluster Entry Id
*/ */
public int getClusterId(final String world, final PlotClusterId id); public int getClusterId(final String world, final PlotClusterId id);
/** /**
* @return A linked hashmap containing all plots * @return A linked hashmap containing all plots
*/ */
public LinkedHashMap<String, HashMap<PlotId, Plot>> getPlots(); public LinkedHashMap<String, HashMap<PlotId, Plot>> getPlots();
/** /**
* @return A hashmap containing all plot clusters * @return A hashmap containing all plot clusters
*/ */
public HashMap<String, HashSet<PlotCluster>> getClusters(); public HashMap<String, HashSet<PlotCluster>> getClusters();
/** /**
* Set the merged status for a plot * Set the merged status for a plot
* *
@ -140,14 +140,14 @@ public interface AbstractDB {
* @param merged boolean[] * @param merged boolean[]
*/ */
public void setMerged(final String world, final Plot plot, final boolean[] merged); public void setMerged(final String world, final Plot plot, final boolean[] merged);
/** /**
* Swap the settings, helpers etc. of two plots * Swap the settings, helpers etc. of two plots
* @param p1 Plot1 * @param p1 Plot1
* @param p2 Plot2 * @param p2 Plot2
*/ */
public void swapPlots(final Plot p1, final Plot p2); public void swapPlots(final Plot p1, final Plot p2);
/** /**
* Set plot flags * Set plot flags
* *
@ -156,7 +156,7 @@ public interface AbstractDB {
* @param flags flags to set (flag[]) * @param flags flags to set (flag[])
*/ */
public void setFlags(final String world, final Plot plot, final Set<Flag> flags); public void setFlags(final String world, final Plot plot, final Set<Flag> flags);
/** /**
* Set cluster flags * Set cluster flags
* *
@ -165,12 +165,12 @@ public interface AbstractDB {
* @param flags flags to set (flag[]) * @param flags flags to set (flag[])
*/ */
public void setFlags(final PlotCluster cluster, final Set<Flag> flags); public void setFlags(final PlotCluster cluster, final Set<Flag> flags);
/** /**
* Rename a cluster * Rename a cluster
*/ */
public void setClusterName(final PlotCluster cluster, final String name); public void setClusterName(final PlotCluster cluster, final String name);
/** /**
* Set the plot alias * Set the plot alias
* *
@ -178,7 +178,7 @@ public interface AbstractDB {
* @param alias Plot Alias * @param alias Plot Alias
*/ */
public void setAlias(final String world, final Plot plot, final String alias); public void setAlias(final String world, final Plot plot, final String alias);
/** /**
* Purgle a plot * Purgle a plot
* *
@ -186,14 +186,14 @@ public interface AbstractDB {
* @param id Plot ID * @param id Plot ID
*/ */
public void purgeIds(final String world, final Set<Integer> uniqueIds); public void purgeIds(final String world, final Set<Integer> uniqueIds);
/** /**
* Purge a whole world * Purge a whole world
* *
* @param world World in which the plots should be purged * @param world World in which the plots should be purged
*/ */
public void purge(final String world, final Set<PlotId> plotIds); public void purge(final String world, final Set<PlotId> plotIds);
/** /**
* Set Plot Home Position * Set Plot Home Position
* *
@ -201,71 +201,71 @@ public interface AbstractDB {
* @param position Plot Home Position * @param position Plot Home Position
*/ */
public void setPosition(final String world, final Plot plot, final String position); public void setPosition(final String world, final Plot plot, final String position);
/** /**
* *
* @param cluster * @param cluster
* @param position * @param position
*/ */
public void setPosition(final PlotCluster cluster, final String position); public void setPosition(final PlotCluster cluster, final String position);
/** /**
* @param id Plot Entry ID * @param id Plot Entry ID
* *
* @return Plot Settings * @return Plot Settings
*/ */
public HashMap<String, Object> getSettings(final int id); public HashMap<String, Object> getSettings(final int id);
/** /**
* *
* @param id * @param id
* @return * @return
*/ */
public HashMap<String, Object> getClusterSettings(final int id); public HashMap<String, Object> getClusterSettings(final int id);
/** /**
* @param plot Plot Object * @param plot Plot Object
* @param uuid Player that should be removed * @param uuid Player that should be removed
*/ */
public void removeHelper(final String world, final Plot plot, final UUID uuid); public void removeHelper(final String world, final Plot plot, final UUID uuid);
/** /**
* @param cluster PlotCluster Object * @param cluster PlotCluster Object
* @param uuid Player that should be removed * @param uuid Player that should be removed
*/ */
public void removeHelper(final PlotCluster cluster, final UUID uuid); public void removeHelper(final PlotCluster cluster, final UUID uuid);
/** /**
* @param plot Plot Object * @param plot Plot Object
* @param uuid Player that should be removed * @param uuid Player that should be removed
*/ */
public void removeTrusted(final String world, final Plot plot, final UUID uuid); public void removeTrusted(final String world, final Plot plot, final UUID uuid);
/** /**
* *
* @param cluster * @param cluster
* @param uuid * @param uuid
*/ */
public void removeInvited(final PlotCluster cluster, final UUID uuid); public void removeInvited(final PlotCluster cluster, final UUID uuid);
/** /**
* @param plot Plot Object * @param plot Plot Object
* @param uuid Player that should be removed * @param uuid Player that should be removed
*/ */
public void setHelper(final String world, final Plot plot, final UUID uuid); public void setHelper(final String world, final Plot plot, final UUID uuid);
/** /**
* @param cluster PlotCluster Object * @param cluster PlotCluster Object
* @param uuid Player that should be removed * @param uuid Player that should be removed
*/ */
public void setHelper(final PlotCluster cluster, final UUID uuid); public void setHelper(final PlotCluster cluster, final UUID uuid);
/** /**
* @param plot Plot Object * @param plot Plot Object
* @param uuid Player that should be added * @param uuid Player that should be added
*/ */
public void setTrusted(final String world, final Plot plot, final UUID uuid); public void setTrusted(final String world, final Plot plot, final UUID uuid);
/** /**
* *
* @param world * @param world
@ -273,19 +273,19 @@ public interface AbstractDB {
* @param uuid * @param uuid
*/ */
public void setInvited(final String world, final PlotCluster cluster, final UUID uuid); public void setInvited(final String world, final PlotCluster cluster, final UUID uuid);
/** /**
* @param plot Plot Object * @param plot Plot Object
* @param player Player that should be added * @param player Player that should be added
*/ */
public void removeDenied(final String world, final Plot plot, final UUID uuid); public void removeDenied(final String world, final Plot plot, final UUID uuid);
/** /**
* @param plot Plot Object * @param plot Plot Object
* @param player Player that should be added * @param player Player that should be added
*/ */
public void setDenied(final String world, final Plot plot, final UUID uuid); public void setDenied(final String world, final Plot plot, final UUID uuid);
/** /**
* Get Plots ratings * Get Plots ratings
* *
@ -294,7 +294,7 @@ public interface AbstractDB {
* @return Plot Ratings (pre-calculated) * @return Plot Ratings (pre-calculated)
*/ */
public double getRatings(final Plot plot); public double getRatings(final Plot plot);
/** /**
* Remove a plot comment * Remove a plot comment
* *
@ -303,7 +303,7 @@ public interface AbstractDB {
* @param comment Comment to remove * @param comment Comment to remove
*/ */
public void removeComment(final String world, final Plot plot, final PlotComment comment); public void removeComment(final String world, final Plot plot, final PlotComment comment);
/** /**
* Set a plot comment * Set a plot comment
* *
@ -312,7 +312,7 @@ public interface AbstractDB {
* @param comment Comment to add * @param comment Comment to add
*/ */
public void setComment(final String world, final Plot plot, final PlotComment comment); public void setComment(final String world, final Plot plot, final PlotComment comment);
/** /**
* Get Plot Comments * Get Plot Comments
* *
@ -323,12 +323,12 @@ public interface AbstractDB {
* @return Plot Comments within the specified tier * @return Plot Comments within the specified tier
*/ */
public ArrayList<PlotComment> getComments(final String world, final Plot plot, final int tier, boolean below); public ArrayList<PlotComment> getComments(final String world, final Plot plot, final int tier, boolean below);
public void createPlotAndSettings(Plot plot); public void createPlotAndSettings(Plot plot);
public void createCluster(PlotCluster cluster); public void createCluster(PlotCluster cluster);
public void resizeCluster(PlotCluster current, PlotClusterId resize); public void resizeCluster(PlotCluster current, PlotClusterId resize);
public void movePlot(String world, PlotId originalPlot, PlotId newPlot); public void movePlot(String world, PlotId originalPlot, PlotId newPlot);
} }

78
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
View File

@ -49,11 +49,11 @@ public class DBFunc {
* Abstract Database Manager * Abstract Database Manager
*/ */
public static AbstractDB dbManager; public static AbstractDB dbManager;
public static void movePlot(final String world, final PlotId originalPlot, final PlotId newPlot) { public static void movePlot(final String world, final PlotId originalPlot, final PlotId newPlot) {
dbManager.movePlot(world, originalPlot, newPlot); dbManager.movePlot(world, originalPlot, newPlot);
} }
/** /**
* Set the owner of a plot * Set the owner of a plot
* *
@ -63,7 +63,7 @@ public class DBFunc {
public static void setOwner(final Plot plot, final UUID uuid) { public static void setOwner(final Plot plot, final UUID uuid) {
dbManager.setOwner(plot, uuid); dbManager.setOwner(plot, uuid);
} }
/** /**
* Create all settings + (helpers, denied, trusted) * Create all settings + (helpers, denied, trusted)
* *
@ -72,7 +72,7 @@ public class DBFunc {
public static void createAllSettingsAndHelpers(final ArrayList<Plot> plots) { public static void createAllSettingsAndHelpers(final ArrayList<Plot> plots) {
dbManager.createAllSettingsAndHelpers(plots); dbManager.createAllSettingsAndHelpers(plots);
} }
/** /**
* Create all plots * Create all plots
* *
@ -81,7 +81,7 @@ public class DBFunc {
public static void createPlots(final ArrayList<Plot> plots) { public static void createPlots(final ArrayList<Plot> plots) {
dbManager.createPlots(plots); dbManager.createPlots(plots);
} }
/** /**
* Create a plot * Create a plot
* *
@ -90,7 +90,7 @@ public class DBFunc {
public static void createPlot(final Plot plot) { public static void createPlot(final Plot plot) {
dbManager.createPlot(plot); dbManager.createPlot(plot);
} }
/** /**
* Create a plot * Create a plot
* *
@ -99,7 +99,7 @@ public class DBFunc {
public static void createPlotAndSettings(final Plot plot) { public static void createPlotAndSettings(final Plot plot) {
dbManager.createPlotAndSettings(plot); dbManager.createPlotAndSettings(plot);
} }
/** /**
* Create tables * Create tables
* *
@ -108,7 +108,7 @@ public class DBFunc {
public static void createTables(final String database, final boolean add_constraint) throws Exception { public static void createTables(final String database, final boolean add_constraint) throws Exception {
dbManager.createTables(database, add_constraint); dbManager.createTables(database, add_constraint);
} }
/** /**
* Delete a plot * Delete a plot
* *
@ -117,11 +117,11 @@ public class DBFunc {
public static void delete(final String world, final Plot plot) { public static void delete(final String world, final Plot plot) {
dbManager.delete(world, plot); dbManager.delete(world, plot);
} }
public static void delete(final PlotCluster toDelete) { public static void delete(final PlotCluster toDelete) {
dbManager.delete(toDelete); dbManager.delete(toDelete);
} }
/** /**
* Create plot settings * Create plot settings
* *
@ -131,7 +131,7 @@ public class DBFunc {
public static void createPlotSettings(final int id, final Plot plot) { public static void createPlotSettings(final int id, final Plot plot) {
dbManager.createPlotSettings(id, plot); dbManager.createPlotSettings(id, plot);
} }
/** /**
* Get a plot id * Get a plot id
* *
@ -153,26 +153,26 @@ public class DBFunc {
public static int getId(final String world, final PlotId id2) { public static int getId(final String world, final PlotId id2) {
return dbManager.getId(world, id2); return dbManager.getId(world, id2);
} }
/** /**
* @return Plots * @return Plots
*/ */
public static LinkedHashMap<String, HashMap<PlotId, Plot>> getPlots() { public static LinkedHashMap<String, HashMap<PlotId, Plot>> getPlots() {
return dbManager.getPlots(); return dbManager.getPlots();
} }
public static void setMerged(final String world, final Plot plot, final boolean[] merged) { public static void setMerged(final String world, final Plot plot, final boolean[] merged) {
dbManager.setMerged(world, plot, merged); dbManager.setMerged(world, plot, merged);
} }
public static void setFlags(final String world, final Plot plot, final Set<Flag> flags) { public static void setFlags(final String world, final Plot plot, final Set<Flag> flags) {
dbManager.setFlags(world, plot, flags); dbManager.setFlags(world, plot, flags);
} }
public static void setFlags(final PlotCluster cluster, final Set<Flag> flags) { public static void setFlags(final PlotCluster cluster, final Set<Flag> flags) {
dbManager.setFlags(cluster, flags); dbManager.setFlags(cluster, flags);
} }
/** /**
* @param plot * @param plot
* @param alias * @param alias
@ -180,15 +180,15 @@ public class DBFunc {
public static void setAlias(final String world, final Plot plot, final String alias) { public static void setAlias(final String world, final Plot plot, final String alias) {
dbManager.setAlias(world, plot, alias); dbManager.setAlias(world, plot, alias);
} }
public static void purgeIds(final String world, final Set<Integer> uniqueIds) { public static void purgeIds(final String world, final Set<Integer> uniqueIds) {
dbManager.purgeIds(world, uniqueIds); dbManager.purgeIds(world, uniqueIds);
} }
public static void purge(final String world, final Set<PlotId> plotIds) { public static void purge(final String world, final Set<PlotId> plotIds) {
dbManager.purge(world, plotIds); dbManager.purge(world, plotIds);
} }
/** /**
* @param plot * @param plot
* @param position * @param position
@ -196,7 +196,7 @@ public class DBFunc {
public static void setPosition(final String world, final Plot plot, final String position) { public static void setPosition(final String world, final Plot plot, final String position) {
dbManager.setPosition(world, plot, position); dbManager.setPosition(world, plot, position);
} }
/** /**
* @param id * @param id
* *
@ -205,7 +205,7 @@ public class DBFunc {
public static HashMap<String, Object> getSettings(final int id) { public static HashMap<String, Object> getSettings(final int id) {
return dbManager.getSettings(id); return dbManager.getSettings(id);
} }
/** /**
* @param plot * @param plot
* @param comment * @param comment
@ -213,7 +213,7 @@ public class DBFunc {
public static void removeComment(final String world, final Plot plot, final PlotComment comment) { public static void removeComment(final String world, final Plot plot, final PlotComment comment) {
dbManager.removeComment(world, plot, comment); dbManager.removeComment(world, plot, comment);
} }
/** /**
* @param plot * @param plot
* @param comment * @param comment
@ -221,14 +221,14 @@ public class DBFunc {
public static void setComment(final String world, final Plot plot, final PlotComment comment) { public static void setComment(final String world, final Plot plot, final PlotComment comment) {
dbManager.setComment(world, plot, comment); dbManager.setComment(world, plot, comment);
} }
/** /**
* @param plot * @param plot
*/ */
public static ArrayList<PlotComment> getComments(final String world, final Plot plot, final int tier, final boolean below) { public static ArrayList<PlotComment> getComments(final String world, final Plot plot, final int tier, final boolean below) {
return dbManager.getComments(world, plot, tier, below); return dbManager.getComments(world, plot, tier, below);
} }
/** /**
* @param plot * @param plot
* @param player * @param player
@ -236,7 +236,7 @@ public class DBFunc {
public static void removeHelper(final String world, final Plot plot, final UUID uuid) { public static void removeHelper(final String world, final Plot plot, final UUID uuid) {
dbManager.removeHelper(world, plot, uuid); dbManager.removeHelper(world, plot, uuid);
} }
/** /**
* @param cluster * @param cluster
* @param player * @param player
@ -244,7 +244,7 @@ public class DBFunc {
public static void removeHelper(final PlotCluster cluster, final UUID uuid) { public static void removeHelper(final PlotCluster cluster, final UUID uuid) {
dbManager.removeHelper(cluster, uuid); dbManager.removeHelper(cluster, uuid);
} }
/** /**
* @param world * @param world
* @param cluster * @param cluster
@ -253,7 +253,7 @@ public class DBFunc {
public static void createCluster(final String world, final PlotCluster cluster) { public static void createCluster(final String world, final PlotCluster cluster) {
dbManager.createCluster(cluster); dbManager.createCluster(cluster);
} }
/** /**
* @param world * @param world
* @param current * @param current
@ -262,7 +262,7 @@ public class DBFunc {
public static void resizeCluster(final PlotCluster current, final PlotClusterId resize) { public static void resizeCluster(final PlotCluster current, final PlotClusterId resize) {
dbManager.resizeCluster(current, resize); dbManager.resizeCluster(current, resize);
} }
/** /**
* @param plot * @param plot
* @param player * @param player
@ -270,7 +270,7 @@ public class DBFunc {
public static void removeTrusted(final String world, final Plot plot, final UUID uuid) { public static void removeTrusted(final String world, final Plot plot, final UUID uuid) {
dbManager.removeTrusted(world, plot, uuid); dbManager.removeTrusted(world, plot, uuid);
} }
/** /**
* *
* @param world * @param world
@ -280,7 +280,7 @@ public class DBFunc {
public static void removeInvited(final PlotCluster cluster, final UUID uuid) { public static void removeInvited(final PlotCluster cluster, final UUID uuid) {
dbManager.removeInvited(cluster, uuid); dbManager.removeInvited(cluster, uuid);
} }
/** /**
* @param plot * @param plot
* @param player * @param player
@ -288,11 +288,11 @@ public class DBFunc {
public static void setHelper(final String world, final Plot plot, final UUID uuid) { public static void setHelper(final String world, final Plot plot, final UUID uuid) {
dbManager.setHelper(world, plot, uuid); dbManager.setHelper(world, plot, uuid);
} }
public static void setHelper(final PlotCluster cluster, final UUID uuid) { public static void setHelper(final PlotCluster cluster, final UUID uuid) {
dbManager.setHelper(cluster, uuid); dbManager.setHelper(cluster, uuid);
} }
/** /**
* @param plot * @param plot
* @param player * @param player
@ -300,11 +300,11 @@ public class DBFunc {
public static void setTrusted(final String world, final Plot plot, final UUID uuid) { public static void setTrusted(final String world, final Plot plot, final UUID uuid) {
dbManager.setTrusted(world, plot, uuid); dbManager.setTrusted(world, plot, uuid);
} }
public static void setInvited(final String world, final PlotCluster cluster, final UUID uuid) { public static void setInvited(final String world, final PlotCluster cluster, final UUID uuid) {
dbManager.setInvited(world, cluster, uuid); dbManager.setInvited(world, cluster, uuid);
} }
/** /**
* @param plot * @param plot
* @param player * @param player
@ -312,7 +312,7 @@ public class DBFunc {
public static void removeDenied(final String world, final Plot plot, final UUID uuid) { public static void removeDenied(final String world, final Plot plot, final UUID uuid) {
dbManager.removeDenied(world, plot, uuid); dbManager.removeDenied(world, plot, uuid);
} }
/** /**
* @param plot * @param plot
* @param player * @param player
@ -320,19 +320,19 @@ public class DBFunc {
public static void setDenied(final String world, final Plot plot, final UUID uuid) { public static void setDenied(final String world, final Plot plot, final UUID uuid) {
dbManager.setDenied(world, plot, uuid); dbManager.setDenied(world, plot, uuid);
} }
public static double getRatings(final Plot plot) { public static double getRatings(final Plot plot) {
return dbManager.getRatings(plot); return dbManager.getRatings(plot);
} }
public static HashMap<String, HashSet<PlotCluster>> getClusters() { public static HashMap<String, HashSet<PlotCluster>> getClusters() {
return dbManager.getClusters(); return dbManager.getClusters();
} }
public static void setPosition(final PlotCluster cluster, final String position) { public static void setPosition(final PlotCluster cluster, final String position) {
dbManager.setPosition(cluster, position); dbManager.setPosition(cluster, position);
} }
public static HashMap<String, Object> getClusterSettings(final int id) { public static HashMap<String, Object> getClusterSettings(final int id) {
return dbManager.getClusterSettings(id); return dbManager.getClusterSettings(id);
} }

14
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/Database.java
View File

@ -37,7 +37,7 @@ public abstract class Database {
* Plugin instance, use for plugin.getDataFolder() * Plugin instance, use for plugin.getDataFolder()
*/ */
protected final PlotSquared plotsquared; protected final PlotSquared plotsquared;
/** /**
* Creates a new Database * Creates a new Database
* *
@ -46,7 +46,7 @@ public abstract class Database {
protected Database(final PlotSquared plotsquared) { protected Database(final PlotSquared plotsquared) {
this.plotsquared = plotsquared; this.plotsquared = plotsquared;
} }
/** /**
* Opens a connection with the database * Opens a connection with the database
* *
@ -56,7 +56,7 @@ public abstract class Database {
* @throws ClassNotFoundException if the driver cannot be found * @throws ClassNotFoundException if the driver cannot be found
*/ */
public abstract Connection openConnection() throws SQLException, ClassNotFoundException; public abstract Connection openConnection() throws SQLException, ClassNotFoundException;
/** /**
* Checks if a connection is open with the database * Checks if a connection is open with the database
* *
@ -65,14 +65,14 @@ public abstract class Database {
* @throws SQLException if the connection cannot be checked * @throws SQLException if the connection cannot be checked
*/ */
public abstract boolean checkConnection() throws SQLException; public abstract boolean checkConnection() throws SQLException;
/** /**
* Gets the connection with the database * Gets the connection with the database
* *
* @return Connection with the database, null if none * @return Connection with the database, null if none
*/ */
public abstract Connection getConnection(); public abstract Connection getConnection();
/** /**
* Closes the connection with the database * Closes the connection with the database
* *
@ -81,7 +81,7 @@ public abstract class Database {
* @throws SQLException if the connection cannot be closed * @throws SQLException if the connection cannot be closed
*/ */
public abstract boolean closeConnection() throws SQLException; public abstract boolean closeConnection() throws SQLException;
/** /**
* Executes a SQL Query<br> If the connection is closed, it will be opened * Executes a SQL Query<br> If the connection is closed, it will be opened
* *
@ -93,7 +93,7 @@ public abstract class Database {
* @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()} * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
*/ */
public abstract ResultSet querySQL(final String query) throws SQLException, ClassNotFoundException; public abstract ResultSet querySQL(final String query) throws SQLException, ClassNotFoundException;
/** /**
* Executes an Update SQL Query<br> See {@link java.sql.Statement#executeUpdate(String)}<br> If the connection is * Executes an Update SQL Query<br> See {@link java.sql.Statement#executeUpdate(String)}<br> If the connection is
* closed, it will be opened * closed, it will be opened

Some files were not shown because too many files have changed in this diff Show More