EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	Bukkit/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
This commit is contained in:
Jesse Boyd
2016-03-30 12:12:19 +11:00
parent 312ad4c48c 31d346a587
commit 1f6ad47a79
110 changed files with 1819 additions and 1927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java
View File

@ -26,7 +26,6 @@ public abstract class FileConfiguration extends MemoryConfiguration {
* Creates an empty {@link FileConfiguration} with no default values.
*/
public FileConfiguration() {
super();
}
/**
@ -35,7 +34,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
*
* @param defaults Default value provider
*/
public FileConfiguration(final Configuration defaults) {
public FileConfiguration(Configuration defaults) {
super(defaults);
}
@ -54,13 +53,13 @@ public abstract class FileConfiguration extends MemoryConfiguration {
* any reason.
* @throws IllegalArgumentException Thrown when file is null.
*/
public void save(final File file) throws IOException {
public void save(File file) throws IOException {
if (file == null) {
throw new NullPointerException("File cannot be null");
}
file.getParentFile().mkdirs();
final String data = saveToString();
String data = saveToString();
try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
writer.write(data);
@ -82,7 +81,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
* any reason.
* @throws IllegalArgumentException Thrown when file is null.
*/
public void save(final String file) throws IOException {
public void save(String file) throws IOException {
if (file == null) {
throw new NullPointerException("File cannot be null");
}
@ -116,12 +115,12 @@ public abstract class FileConfiguration extends MemoryConfiguration {
* a valid Configuration.
* @throws IllegalArgumentException Thrown when file is null.
*/
public void load(final File file) throws IOException, InvalidConfigurationException {
public void load(File file) throws IOException, InvalidConfigurationException {
if (file == null) {
throw new NullPointerException("File cannot be null");
}
final FileInputStream stream = new FileInputStream(file);
FileInputStream stream = new FileInputStream(file);
load(new InputStreamReader(stream, StandardCharsets.UTF_8));
}
@ -139,9 +138,9 @@ public abstract class FileConfiguration extends MemoryConfiguration {
* represent a valid Configuration
* @throws IllegalArgumentException thrown when reader is null
*/
public void load(final Reader reader) throws IOException, InvalidConfigurationException {
public void load(Reader reader) throws IOException, InvalidConfigurationException {
final StringBuilder builder = new StringBuilder();
StringBuilder builder = new StringBuilder();
try (BufferedReader input = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader)) {
String line;
@ -173,7 +172,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
* a valid Configuration.
* @throws IllegalArgumentException Thrown when file is null.
*/
public void load(final String file) throws IOException, InvalidConfigurationException {
public void load(String file) throws IOException, InvalidConfigurationException {
if (file == null) {
throw new NullPointerException("File cannot be null");
}
@ -196,7 +195,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
* invalid.
* @throws IllegalArgumentException Thrown if contents is null.
*/
public abstract void loadFromString(final String contents) throws InvalidConfigurationException;
public abstract void loadFromString(String contents) throws InvalidConfigurationException;
/**
* Compiles the header for this {@link FileConfiguration} and returns the
@ -212,10 +211,10 @@ public abstract class FileConfiguration extends MemoryConfiguration {
@Override
public FileConfigurationOptions options() {
if (options == null) {
options = new FileConfigurationOptions(this);
if (this.options == null) {
this.options = new FileConfigurationOptions(this);
}
return (FileConfigurationOptions) options;
return (FileConfigurationOptions) this.options;
}
}

26
Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java
View File

@ -4,47 +4,47 @@ package com.intellectualcrafters.jnbt;
* The {@code TAG_Byte_Array} tag.
*/
public final class ByteArrayTag extends Tag {
private final byte[] value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public ByteArrayTag(final byte[] value) {
super();
public ByteArrayTag(byte[] value) {
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public ByteArrayTag(final String name, final byte[] value) {
public ByteArrayTag(String name, byte[] value) {
super(name);
this.value = value;
}
@Override
public byte[] getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final StringBuilder hex = new StringBuilder();
for (final byte b : value) {
final String hexDigits = Integer.toHexString(b).toUpperCase();
StringBuilder hex = new StringBuilder();
for (byte b : this.value) {
String hexDigits = Integer.toHexString(b).toUpperCase();
if (hexDigits.length() == 1) {
hex.append("0");
}
hex.append(hexDigits).append(" ");
}
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_Byte_Array" + append + ": " + hex;

22
Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java
View File

@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
* The {@code TAG_Byte} tag.
*/
public final class ByteTag extends Tag {
private final byte value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public ByteTag(final byte value) {
super();
public ByteTag(byte value) {
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public ByteTag(final String name, final byte value) {
public ByteTag(String name, byte value) {
super(name);
this.value = value;
}
@Override
public Byte getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_Byte" + append + ": " + value;
return "TAG_Byte" + append + ": " + this.value;
}
}

3
Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java
View File

@ -18,7 +18,6 @@ public final class CompoundTag extends Tag {
* @param value the value of the tag
*/
public CompoundTag(Map<String, Tag> value) {
super();
this.value = Collections.unmodifiableMap(value);
}
@ -374,7 +373,7 @@ public final class CompoundTag extends Tag {
public String toString() {
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
StringBuilder bldr = new StringBuilder();

71
Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java
View File

@ -9,25 +9,26 @@ import java.util.Map;
* Helps create compound tags.
*/
public class CompoundTagBuilder {
private final Map<String, Tag> entries;
/**
* Create a new instance.
*/
CompoundTagBuilder() {
entries = new HashMap<String, Tag>();
this.entries = new HashMap<String, Tag>();
}
/**
* Create a new instance and use the given map (which will be modified).
*
* @param value the value
*/
CompoundTagBuilder(final Map<String, Tag> value) {
CompoundTagBuilder(Map<String, Tag> value) {
checkNotNull(value);
entries = value;
this.entries = value;
}
/**
* Create a new builder instance.
*
@ -36,7 +37,7 @@ public class CompoundTagBuilder {
public static CompoundTagBuilder create() {
return new CompoundTagBuilder();
}
/**
* Put the given key and tag into the compound tag.
*
@ -45,13 +46,13 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder put(final String key, final Tag value) {
public CompoundTagBuilder put(String key, Tag value) {
checkNotNull(key);
checkNotNull(value);
entries.put(key, value);
this.entries.put(key, value);
return this;
}
/**
* Put the given key and value into the compound tag as a {@code ByteArrayTag}.
*
@ -60,10 +61,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putByteArray(final String key, final byte[] value) {
public CompoundTagBuilder putByteArray(String key, byte[] value) {
return put(key, new ByteArrayTag(key, value));
}
/**
* Put the given key and value into the compound tag as a {@code ByteTag}.
*
@ -72,10 +73,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putByte(final String key, final byte value) {
public CompoundTagBuilder putByte(String key, byte value) {
return put(key, new ByteTag(key, value));
}
/**
* Put the given key and value into the compound tag as a {@code DoubleTag}.
*
@ -84,10 +85,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putDouble(final String key, final double value) {
public CompoundTagBuilder putDouble(String key, double value) {
return put(key, new DoubleTag(key, value));
}
/**
* Put the given key and value into the compound tag as a {@code FloatTag}.
*
@ -96,10 +97,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putFloat(final String key, final float value) {
public CompoundTagBuilder putFloat(String key, float value) {
return put(key, new FloatTag(key, value));
}
/**
* Put the given key and value into the compound tag as a {@code IntArrayTag}.
*
@ -108,10 +109,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putIntArray(final String key, final int[] value) {
public CompoundTagBuilder putIntArray(String key, int[] value) {
return put(key, new IntArrayTag(key, value));
}
/**
* Put the given key and value into the compound tag as an {@code IntTag}.
*
@ -120,10 +121,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putInt(final String key, final int value) {
public CompoundTagBuilder putInt(String key, int value) {
return put(key, new IntTag(key, value));
}
/**
* Put the given key and value into the compound tag as a {@code LongTag}.
*
@ -132,10 +133,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putLong(final String key, final long value) {
public CompoundTagBuilder putLong(String key, long value) {
return put(key, new LongTag(key, value));
}
/**
* Put the given key and value into the compound tag as a {@code ShortTag}.
*
@ -144,10 +145,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putShort(final String key, final short value) {
public CompoundTagBuilder putShort(String key, short value) {
return put(key, new ShortTag(key, value));
}
/**
* Put the given key and value into the compound tag as a {@code StringTag}.
*
@ -156,10 +157,10 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putString(final String key, final String value) {
public CompoundTagBuilder putString(String key, String value) {
return put(key, new StringTag(key, value));
}
/**
* Put all the entries from the given map into this map.
*
@ -167,23 +168,23 @@ public class CompoundTagBuilder {
*
* @return this object
*/
public CompoundTagBuilder putAll(final Map<String, ? extends Tag> value) {
public CompoundTagBuilder putAll(Map<String, ? extends Tag> value) {
checkNotNull(value);
for (final Map.Entry<String, ? extends Tag> entry : value.entrySet()) {
for (Map.Entry<String, ? extends Tag> entry : value.entrySet()) {
put(entry.getKey(), entry.getValue());
}
return this;
}
/**
* Build an unnamed compound tag with this builder's entries.
*
* @return the new compound tag
*/
public CompoundTag build() {
return new CompoundTag(new HashMap<String, Tag>(entries));
return new CompoundTag(new HashMap<String, Tag>(this.entries));
}
/**
* Build a new compound tag with this builder's entries.
*
@ -191,7 +192,7 @@ public class CompoundTagBuilder {
*
* @return the created compound tag
*/
public CompoundTag build(final String name) {
return new CompoundTag(name, new HashMap<String, Tag>(entries));
public CompoundTag build(String name) {
return new CompoundTag(name, new HashMap<String, Tag>(this.entries));
}
}

22
Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java
View File

@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
* The {@code TAG_Double} tag.
*/
public final class DoubleTag extends Tag {
private final double value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public DoubleTag(final double value) {
super();
public DoubleTag(double value) {
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public DoubleTag(final String name, final double value) {
public DoubleTag(String name, double value) {
super(name);
this.value = value;
}
@Override
public Double getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_Double" + append + ": " + value;
return "TAG_Double" + append + ": " + this.value;
}
}

6
Core/src/main/java/com/intellectualcrafters/jnbt/EndTag.java
View File

@ -4,18 +4,18 @@ package com.intellectualcrafters.jnbt;
* The {@code TAG_End} tag.
*/
public final class EndTag extends Tag {
/**
* Creates the tag.
*/
public EndTag() {
super();
}
@Override
public Object getValue() {
return null;
}
@Override
public String toString() {
return "TAG_End";

22
Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java
View File

@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
* The {@code TAG_Float} tag.
*/
public final class FloatTag extends Tag {
private final float value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public FloatTag(final float value) {
super();
public FloatTag(float value) {
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public FloatTag(final String name, final float value) {
public FloatTag(String name, float value) {
super(name);
this.value = value;
}
@Override
public Float getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_Float" + append + ": " + value;
return "TAG_Float" + append + ": " + this.value;
}
}

26
Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java
View File

@ -6,49 +6,49 @@ import static com.google.common.base.Preconditions.checkNotNull;
* The {@code TAG_Int_Array} tag.
*/
public final class IntArrayTag extends Tag {
private final int[] value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public IntArrayTag(final int[] value) {
super();
public IntArrayTag(int[] value) {
checkNotNull(value);
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public IntArrayTag(final String name, final int[] value) {
public IntArrayTag(String name, int[] value) {
super(name);
checkNotNull(value);
this.value = value;
}
@Override
public int[] getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final StringBuilder hex = new StringBuilder();
for (final int b : value) {
final String hexDigits = Integer.toHexString(b).toUpperCase();
StringBuilder hex = new StringBuilder();
for (int b : this.value) {
String hexDigits = Integer.toHexString(b).toUpperCase();
if (hexDigits.length() == 1) {
hex.append("0");
}
hex.append(hexDigits).append(" ");
}
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_Int_Array" + append + ": " + hex;

22
Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java
View File

@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
* The {@code TAG_Int} tag.
*/
public final class IntTag extends Tag {
private final int value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public IntTag(final int value) {
super();
public IntTag(int value) {
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public IntTag(final String name, final int value) {
public IntTag(String name, int value) {
super(name);
this.value = value;
}
@Override
public Integer getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_Int" + append + ": " + value;
return "TAG_Int" + append + ": " + this.value;
}
}

138
Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java
View File

@ -10,22 +10,22 @@ import java.util.NoSuchElementException;
* The {@code TAG_List} tag.
*/
public final class ListTag extends Tag {
private final Class<? extends Tag> type;
private final List<Tag> value;
/**
* Creates the tag with an empty name.
*
* @param type the type of tag
* @param value the value of the tag
*/
public ListTag(final Class<? extends Tag> type, final List<? extends Tag> value) {
super();
public ListTag(Class<? extends Tag> type, List<? extends Tag> value) {
checkNotNull(value);
this.type = type;
this.value = Collections.unmodifiableList(value);
}
/**
* Creates the tag.
*
@ -33,27 +33,27 @@ public final class ListTag extends Tag {
* @param type the type of tag
* @param value the value of the tag
*/
public ListTag(final String name, final Class<? extends Tag> type, final List<? extends Tag> value) {
public ListTag(String name, Class<? extends Tag> type, List<? extends Tag> value) {
super(name);
checkNotNull(value);
this.type = type;
this.value = Collections.unmodifiableList(value);
}
/**
* Gets the type of item in this list.
*
* @return The type of item in this list.
*/
public Class<? extends Tag> getType() {
return type;
return this.type;
}
@Override
public List<Tag> getValue() {
return value;
return this.value;
}
/**
* Create a new list tag with this tag's name and type.
*
@ -61,10 +61,10 @@ public final class ListTag extends Tag {
*
* @return a new list tag
*/
public ListTag setValue(final List<Tag> list) {
public ListTag setValue(List<Tag> list) {
return new ListTag(getName(), getType(), list);
}
/**
* Get the tag if it exists at the given index.
*
@ -72,14 +72,14 @@ public final class ListTag extends Tag {
*
* @return the tag or null
*/
public Tag getIfExists(final int index) {
public Tag getIfExists(int index) {
try {
return value.get(index);
} catch (final NoSuchElementException e) {
return this.value.get(index);
} catch (NoSuchElementException e) {
return null;
}
}
/**
* Get a byte array named with the given index. <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>
@ -88,15 +88,15 @@ public final class ListTag extends Tag {
*
* @return a byte array
*/
public byte[] getByteArray(final int index) {
final Tag tag = getIfExists(index);
public byte[] getByteArray(int index) {
Tag tag = getIfExists(index);
if (tag instanceof ByteArrayTag) {
return ((ByteArrayTag) tag).getValue();
} else {
return new byte[0];
}
}
/**
* Get a byte named with the given index. <p> If the index does not exist or its value is not a byte tag, then
* {@code 0} will be returned. </p>
@ -105,15 +105,15 @@ public final class ListTag extends Tag {
*
* @return a byte
*/
public byte getByte(final int index) {
final Tag tag = getIfExists(index);
public byte getByte(int index) {
Tag tag = getIfExists(index);
if (tag instanceof ByteTag) {
return ((ByteTag) tag).getValue();
} else {
return (byte) 0;
}
}
/**
* Get a double named with the given index. <p> If the index does not exist or its value is not a double tag,
* then {@code 0} will be returned. </p>
@ -122,15 +122,15 @@ public final class ListTag extends Tag {
*
* @return a double
*/
public double getDouble(final int index) {
final Tag tag = getIfExists(index);
public double getDouble(int index) {
Tag tag = getIfExists(index);
if (tag instanceof DoubleTag) {
return ((DoubleTag) tag).getValue();
} else {
return 0;
}
}
/**
* Get a double named with the given index, even if it's another type of number. <p> If the index does not
* exist or its value is not a number, then {@code 0} will be returned. </p>
@ -139,8 +139,8 @@ public final class ListTag extends Tag {
*
* @return a double
*/
public double asDouble(final int index) {
final Tag tag = getIfExists(index);
public double asDouble(int index) {
Tag tag = getIfExists(index);
if (tag instanceof ByteTag) {
return ((ByteTag) tag).getValue();
} else if (tag instanceof ShortTag) {
@ -157,7 +157,7 @@ public final class ListTag extends Tag {
return 0;
}
}
/**
* Get a float named with the given index. <p> If the index does not exist or its value is not a float tag,
* then {@code 0} will be returned. </p>
@ -166,15 +166,15 @@ public final class ListTag extends Tag {
*
* @return a float
*/
public float getFloat(final int index) {
final Tag tag = getIfExists(index);
public float getFloat(int index) {
Tag tag = getIfExists(index);
if (tag instanceof FloatTag) {
return ((FloatTag) tag).getValue();
} else {
return 0;
}
}
/**
* Get a {@code int[]} named with the given index. <p> If the index does not exist or its value is not an int
* array tag, then an empty array will be returned. </p>
@ -183,15 +183,15 @@ public final class ListTag extends Tag {
*
* @return an int array
*/
public int[] getIntArray(final int index) {
final Tag tag = getIfExists(index);
public int[] getIntArray(int index) {
Tag tag = getIfExists(index);
if (tag instanceof IntArrayTag) {
return ((IntArrayTag) tag).getValue();
} else {
return new int[0];
}
}
/**
* Get an int named with the given index. <p> If the index does not exist or its value is not an int tag, then
* {@code 0} will be returned. </p>
@ -200,15 +200,15 @@ public final class ListTag extends Tag {
*
* @return an int
*/
public int getInt(final int index) {
final Tag tag = getIfExists(index);
public int getInt(int index) {
Tag tag = getIfExists(index);
if (tag instanceof IntTag) {
return ((IntTag) tag).getValue();
} else {
return 0;
}
}
/**
* Get an int named with the given index, even if it's another type of number. <p> If the index does not exist
* or its value is not a number, then {@code 0} will be returned. </p>
@ -217,8 +217,8 @@ public final class ListTag extends Tag {
*
* @return an int
*/
public int asInt(final int index) {
final Tag tag = getIfExists(index);
public int asInt(int index) {
Tag tag = getIfExists(index);
if (tag instanceof ByteTag) {
return ((ByteTag) tag).getValue();
} else if (tag instanceof ShortTag) {
@ -235,7 +235,7 @@ public final class ListTag extends Tag {
return 0;
}
}
/**
* Get a list of tags named with the given index. <p> If the index does not exist or its value is not a list
* tag, then an empty list will be returned. </p>
@ -244,15 +244,15 @@ public final class ListTag extends Tag {
*
* @return a list of tags
*/
public List<Tag> getList(final int index) {
final Tag tag = getIfExists(index);
public List<Tag> getList(int index) {
Tag tag = getIfExists(index);
if (tag instanceof ListTag) {
return ((ListTag) tag).getValue();
} else {
return Collections.emptyList();
}
}
/**
* Get a {@code TagList} named with the given index. <p> If the index does not exist or its value is not a list
* tag, then an empty tag list will be returned. </p>
@ -261,15 +261,15 @@ public final class ListTag extends Tag {
*
* @return a tag list instance
*/
public ListTag getListTag(final int index) {
final Tag tag = getIfExists(index);
public ListTag getListTag(int index) {
Tag tag = getIfExists(index);
if (tag instanceof ListTag) {
return (ListTag) tag;
} else {
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> 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
@ -282,10 +282,10 @@ public final class ListTag extends Tag {
* @return a list of tags
*/
@SuppressWarnings("unchecked")
public <T extends Tag> List<T> getList(final int index, final Class<T> listType) {
final Tag tag = getIfExists(index);
public <T extends Tag> List<T> getList(int index, Class<T> listType) {
Tag tag = getIfExists(index);
if (tag instanceof ListTag) {
final ListTag listTag = (ListTag) tag;
ListTag listTag = (ListTag) tag;
if (listTag.getType().equals(listType)) {
return (List<T>) listTag.getValue();
} else {
@ -295,7 +295,7 @@ public final class ListTag extends Tag {
return Collections.emptyList();
}
}
/**
* Get a long named with the given index. <p> If the index does not exist or its value is not a long tag, then
* {@code 0} will be returned. </p>
@ -304,15 +304,15 @@ public final class ListTag extends Tag {
*
* @return a long
*/
public long getLong(final int index) {
final Tag tag = getIfExists(index);
public long getLong(int index) {
Tag tag = getIfExists(index);
if (tag instanceof LongTag) {
return ((LongTag) tag).getValue();
} else {
return 0L;
}
}
/**
* Get a long named with the given index, even if it's another type of number. <p> If the index does not exist
* or its value is not a number, then {@code 0} will be returned. </p>
@ -321,8 +321,8 @@ public final class ListTag extends Tag {
*
* @return a long
*/
public long asLong(final int index) {
final Tag tag = getIfExists(index);
public long asLong(int index) {
Tag tag = getIfExists(index);
if (tag instanceof ByteTag) {
return ((ByteTag) tag).getValue();
} else if (tag instanceof ShortTag) {
@ -339,7 +339,7 @@ public final class ListTag extends Tag {
return 0;
}
}
/**
* Get a short named with the given index. <p> If the index does not exist or its value is not a short tag,
* then {@code 0} will be returned. </p>
@ -348,15 +348,15 @@ public final class ListTag extends Tag {
*
* @return a short
*/
public short getShort(final int index) {
final Tag tag = getIfExists(index);
public short getShort(int index) {
Tag tag = getIfExists(index);
if (tag instanceof ShortTag) {
return ((ShortTag) tag).getValue();
} else {
return 0;
}
}
/**
* Get a string named with the given index. <p> If the index does not exist or its value is not a string tag,
* then {@code ""} will be returned. </p>
@ -365,25 +365,27 @@ public final class ListTag extends Tag {
*
* @return a string
*/
public String getString(final int index) {
final Tag tag = getIfExists(index);
public String getString(int index) {
Tag tag = getIfExists(index);
if (tag instanceof StringTag) {
return ((StringTag) tag).getValue();
} else {
return "";
}
}
@Override
public String toString() {
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
final StringBuilder bldr = new StringBuilder();
bldr.append("TAG_List").append(append).append(": ").append(value.size()).append(" entries of type ").append(NBTUtils.getTypeName(type)).append("\r\n{\r\n");
for (final Tag t : value) {
StringBuilder bldr = new StringBuilder();
bldr.append("TAG_List").append(append).append(": ").append(this.value.size()).append(" entries of type ")
.append(NBTUtils.getTypeName(this.type))
.append("\r\n{\r\n");
for (Tag t : this.value) {
bldr.append(" ").append(t.toString().replaceAll("\r\n", "\r\n ")).append("\r\n");
}
bldr.append("}");

45
Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java
View File

@ -11,20 +11,21 @@ import java.util.List;
* Helps create list tags.
*/
public class ListTagBuilder {
private final Class<? extends Tag> type;
private final List<Tag> entries;
/**
* Create a new instance.
*
* @param type of tag contained in this list
*/
ListTagBuilder(final Class<? extends Tag> type) {
ListTagBuilder(Class<? extends Tag> type) {
checkNotNull(type);
this.type = type;
entries = new ArrayList<Tag>();
this.entries = new ArrayList<Tag>();
}
/**
* Create a new builder instance.
*
@ -32,10 +33,10 @@ public class ListTagBuilder {
*
* @return a new builder
*/
public static ListTagBuilder create(final Class<? extends Tag> type) {
public static ListTagBuilder create(Class<? extends Tag> type) {
return new ListTagBuilder(type);
}
/**
* Create a new builder instance.
*
@ -45,22 +46,22 @@ public class ListTagBuilder {
* @return a new builder
*/
@SafeVarargs
public static <T extends Tag> ListTagBuilder createWith(final T... entries) {
public static <T extends Tag> ListTagBuilder createWith(T... entries) {
checkNotNull(entries);
if (entries.length == 0) {
throw new IllegalArgumentException("This method needs an array of at least one entry");
}
final Class<? extends Tag> type = entries[0].getClass();
Class<? extends Tag> type = entries[0].getClass();
for (int i = 1; i < entries.length; i++) {
if (!type.isInstance(entries[i])) {
throw new IllegalArgumentException("An array of different tag types was provided");
}
}
final ListTagBuilder builder = new ListTagBuilder(type);
ListTagBuilder builder = new ListTagBuilder(type);
builder.addAll(Arrays.asList(entries));
return builder;
}
/**
* Add the given tag.
*
@ -68,15 +69,15 @@ public class ListTagBuilder {
*
* @return this object
*/
public ListTagBuilder add(final Tag value) {
public ListTagBuilder add(Tag value) {
checkNotNull(value);
if (!type.isInstance(value)) {
throw new IllegalArgumentException(value.getClass().getCanonicalName() + " is not of expected type " + type.getCanonicalName());
if (!this.type.isInstance(value)) {
throw new IllegalArgumentException(value.getClass().getCanonicalName() + " is not of expected type " + this.type.getCanonicalName());
}
entries.add(value);
this.entries.add(value);
return this;
}
/**
* Add all the tags in the given list.
*
@ -84,23 +85,23 @@ public class ListTagBuilder {
*
* @return this object
*/
public ListTagBuilder addAll(final Collection<? extends Tag> value) {
public ListTagBuilder addAll(Collection<? extends Tag> value) {
checkNotNull(value);
for (final Tag v : value) {
for (Tag v : value) {
add(v);
}
return this;
}
/**
* Build an unnamed list tag with this builder's entries.
*
* @return the new list tag
*/
public ListTag build() {
return new ListTag(type, new ArrayList<Tag>(entries));
return new ListTag(this.type, new ArrayList<Tag>(this.entries));
}
/**
* Build a new list tag with this builder's entries.
*
@ -108,7 +109,7 @@ public class ListTagBuilder {
*
* @return the created list tag
*/
public ListTag build(final String name) {
return new ListTag(name, type, new ArrayList<Tag>(entries));
public ListTag build(String name) {
return new ListTag(name, this.type, new ArrayList<Tag>(this.entries));
}
}

22
Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java
View File

@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
* The {@code TAG_Long} tag.
*/
public final class LongTag extends Tag {
private final long value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public LongTag(final long value) {
super();
public LongTag(long value) {
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public LongTag(final String name, final long value) {
public LongTag(String name, long value) {
super(name);
this.value = value;
}
@Override
public Long getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_Long" + append + ": " + value;
return "TAG_Long" + append + ": " + this.value;
}
}

14
Core/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java
View File

@ -9,14 +9,16 @@ import java.nio.charset.StandardCharsets;
public final class NBTConstants {
public static final Charset CHARSET = StandardCharsets.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.
*/
private NBTConstants() {}
private NBTConstants() {
}
/**
* Convert a type ID to its corresponding {@link Tag} class.
*
@ -26,7 +28,7 @@ public final class NBTConstants {
*
* @throws IllegalArgumentException thrown if the tag ID is not valid
*/
public static Class<? extends Tag> getClassFromType(final int id) {
public static Class<? extends Tag> getClassFromType(int id) {
switch (id) {
case TYPE_END:
return EndTag.class;

109
Core/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java
View File

@ -15,10 +15,11 @@ import java.util.Map;
* may be found at @linktourl http://www.minecraft.net/docs/NBT.txt"> http://www.minecraft.net/docs/NBT.txt.
*/
public final class NBTInputStream implements Closeable {
private final DataInputStream is;
private int count;
/**
* Creates a new {@code NBTInputStream}, which will source its data from the specified input stream.
*
@ -26,10 +27,10 @@ public final class NBTInputStream implements Closeable {
*
* @throws IOException if an I/O error occurs
*/
public NBTInputStream(final InputStream is) {
public NBTInputStream(InputStream is) {
this.is = new DataInputStream(is);
}
/**
* Reads an NBT tag from the stream.
*
@ -40,7 +41,7 @@ public final class NBTInputStream implements Closeable {
public Tag readTag() throws IOException {
return readTag(0, Integer.MAX_VALUE);
}
/**
* Reads an NBT tag from the stream.
*
@ -48,10 +49,10 @@ public final class NBTInputStream implements Closeable {
*
* @throws IOException if an I/O error occurs.
*/
public Tag readTag(final int maxDepth) throws IOException {
public Tag readTag(int maxDepth) throws IOException {
return readTag(0, maxDepth);
}
/**
* Reads an NBT from the stream.
*
@ -61,23 +62,23 @@ public final class NBTInputStream implements Closeable {
*
* @throws IOException if an I/O error occurs.
*/
private Tag readTag(final int depth, final int maxDepth) throws IOException {
if ((count++) > maxDepth) {
throw new IOException("Exceeds max depth: " + count);
private Tag readTag(int depth, int maxDepth) throws IOException {
if (this.count++ > maxDepth) {
throw new IOException("Exceeds max depth: " + this.count);
}
final int type = is.readByte() & 0xFF;
int type = this.is.readByte() & 0xFF;
String name;
if (type != NBTConstants.TYPE_END) {
final int nameLength = is.readShort() & 0xFFFF;
final byte[] nameBytes = new byte[nameLength];
is.readFully(nameBytes);
int nameLength = this.is.readShort() & 0xFFFF;
byte[] nameBytes = new byte[nameLength];
this.is.readFully(nameBytes);
name = new String(nameBytes, NBTConstants.CHARSET);
} else {
name = "";
}
return readTagPayload(type, name, depth, maxDepth);
}
/**
* Reads the payload of a tag, given the name and type.
*
@ -89,11 +90,11 @@ public final class NBTInputStream implements Closeable {
*
* @throws IOException if an I/O error occurs.
*/
private Tag readTagPayload(final int type, final String name, final int depth, final int maxDepth) throws IOException {
if ((count++) > maxDepth) {
throw new IOException("Exceeds max depth: " + count);
private Tag readTagPayload(int type, String name, int depth, int maxDepth) throws IOException {
if (this.count++ > maxDepth) {
throw new IOException("Exceeds max depth: " + this.count);
}
count++;
this.count++;
switch (type) {
case NBTConstants.TYPE_END:
if (depth == 0) {
@ -102,54 +103,54 @@ public final class NBTInputStream implements Closeable {
return new EndTag();
}
case NBTConstants.TYPE_BYTE:
return new ByteTag(name, is.readByte());
return new ByteTag(name, this.is.readByte());
case NBTConstants.TYPE_SHORT:
return new ShortTag(name, is.readShort());
return new ShortTag(name, this.is.readShort());
case NBTConstants.TYPE_INT:
return new IntTag(name, is.readInt());
return new IntTag(name, this.is.readInt());
case NBTConstants.TYPE_LONG:
return new LongTag(name, is.readLong());
return new LongTag(name, this.is.readLong());
case NBTConstants.TYPE_FLOAT:
return new FloatTag(name, is.readFloat());
return new FloatTag(name, this.is.readFloat());
case NBTConstants.TYPE_DOUBLE:
return new DoubleTag(name, is.readDouble());
return new DoubleTag(name, this.is.readDouble());
case NBTConstants.TYPE_BYTE_ARRAY:
int length = is.readInt();
int length = this.is.readInt();
// Max depth
if ((count += length) > maxDepth) {
throw new IOException("Exceeds max depth: " + count);
if ((this.count += length) > maxDepth) {
throw new IOException("Exceeds max depth: " + this.count);
//
}
byte[] bytes = new byte[length];
is.readFully(bytes);
this.is.readFully(bytes);
return new ByteArrayTag(name, bytes);
case NBTConstants.TYPE_STRING:
length = is.readShort();
length = this.is.readShort();
// Max depth
if ((count += length) > maxDepth) {
throw new IOException("Exceeds max depth: " + count);
if ((this.count += length) > maxDepth) {
throw new IOException("Exceeds max depth: " + this.count);
//
}
bytes = new byte[length];
is.readFully(bytes);
this.is.readFully(bytes);
return new StringTag(name, new String(bytes, NBTConstants.CHARSET));
case NBTConstants.TYPE_LIST:
final int childType = is.readByte();
length = is.readInt();
int childType = this.is.readByte();
length = this.is.readInt();
// Max depth
if ((count += length) > maxDepth) {
throw new IOException("Exceeds max depth: " + count);
if ((this.count += length) > maxDepth) {
throw new IOException("Exceeds max depth: " + this.count);
//
}
final List<Tag> tagList = new ArrayList<Tag>();
List<Tag> tagList = new ArrayList<Tag>();
for (int i = 0; i < length; ++i) {
final Tag tag = readTagPayload(childType, "", depth + 1, maxDepth);
Tag tag = readTagPayload(childType, "", depth + 1, maxDepth);
if (tag instanceof EndTag) {
throw new IOException("TAG_End not permitted in a list.");
}
@ -157,9 +158,9 @@ public final class NBTInputStream implements Closeable {
}
return new ListTag(name, NBTUtils.getTypeClass(childType), tagList);
case NBTConstants.TYPE_COMPOUND:
final Map<String, Tag> tagMap = new HashMap<String, Tag>();
Map<String, Tag> tagMap = new HashMap<String, Tag>();
while (true) {
final Tag tag = readTag(depth + 1, maxDepth);
Tag tag = readTag(depth + 1, maxDepth);
if (tag instanceof EndTag) {
break;
} else {
@ -168,24 +169,24 @@ public final class NBTInputStream implements Closeable {
}
return new CompoundTag(name, tagMap);
case NBTConstants.TYPE_INT_ARRAY:
length = is.readInt();
length = this.is.readInt();
// Max depth
if ((count += length) > maxDepth) {
throw new IOException("Exceeds max depth: " + count);
if ((this.count += length) > maxDepth) {
throw new IOException("Exceeds max depth: " + this.count);
}
//
final int[] data = new int[length];
int[] data = new int[length];
for (int i = 0; i < length; i++) {
data[i] = is.readInt();
data[i] = this.is.readInt();
}
return new IntArrayTag(name, data);
default:
throw new IOException("Invalid tag type: " + type + ".");
}
}
@Override
public void close() throws IOException {
is.close();
this.is.close();
}
}

33
Core/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java
View File

@ -16,11 +16,12 @@ import java.util.List;
* @author Graham Edgecombe
*/
public final class NBTOutputStream implements Closeable {
/**
* The output stream.
*/
private final DataOutputStream os;
/**
* Creates a new <code>NBTOutputStream</code>, which will write data to the specified underlying output stream.
*
@ -31,7 +32,7 @@ public final class NBTOutputStream implements Closeable {
public NBTOutputStream(OutputStream os) {
this.os = new DataOutputStream(os);
}
/**
* Writes a tag.
*
@ -51,7 +52,7 @@ public final class NBTOutputStream implements Closeable {
}
writeTagPayload(tag);
}
/**
* Writes tag payload.
*
@ -102,7 +103,7 @@ public final class NBTOutputStream implements Closeable {
throw new IOException("Invalid tag type: " + type + ".");
}
}
/**
* Writes a <code>TAG_Byte</code> tag.
*
@ -113,7 +114,7 @@ public final class NBTOutputStream implements Closeable {
private void writeByteTagPayload(ByteTag tag) throws IOException {
this.os.writeByte(tag.getValue());
}
/**
* Writes a <code>TAG_Byte_Array</code> tag.
*
@ -126,7 +127,7 @@ public final class NBTOutputStream implements Closeable {
this.os.writeInt(bytes.length);
this.os.write(bytes);
}
/**
* Writes a <code>TAG_Compound</code> tag.
*
@ -140,7 +141,7 @@ public final class NBTOutputStream implements Closeable {
}
this.os.writeByte((byte) 0); // end tag - better way?
}
/**
* Writes a <code>TAG_List</code> tag.
*
@ -158,7 +159,7 @@ public final class NBTOutputStream implements Closeable {
writeTagPayload(tag1);
}
}
/**
* Writes a <code>TAG_String</code> tag.
*
@ -171,7 +172,7 @@ public final class NBTOutputStream implements Closeable {
this.os.writeShort(bytes.length);
this.os.write(bytes);
}
/**
* Writes a <code>TAG_Double</code> tag.
*
@ -182,7 +183,7 @@ public final class NBTOutputStream implements Closeable {
private void writeDoubleTagPayload(DoubleTag tag) throws IOException {
this.os.writeDouble(tag.getValue());
}
/**
* Writes a <code>TAG_Float</code> tag.
*
@ -193,7 +194,7 @@ public final class NBTOutputStream implements Closeable {
private void writeFloatTagPayload(FloatTag tag) throws IOException {
this.os.writeFloat(tag.getValue());
}
/**
* Writes a <code>TAG_Long</code> tag.
*
@ -204,7 +205,7 @@ public final class NBTOutputStream implements Closeable {
private void writeLongTagPayload(LongTag tag) throws IOException {
this.os.writeLong(tag.getValue());
}
/**
* Writes a <code>TAG_Int</code> tag.
*
@ -215,7 +216,7 @@ public final class NBTOutputStream implements Closeable {
private void writeIntTagPayload(IntTag tag) throws IOException {
this.os.writeInt(tag.getValue());
}
/**
* Writes a <code>TAG_Short</code> tag.
*
@ -226,7 +227,7 @@ public final class NBTOutputStream implements Closeable {
private void writeShortTagPayload(ShortTag tag) throws IOException {
this.os.writeShort(tag.getValue());
}
/**
* Writes a <code>TAG_Empty</code> tag.
*
@ -243,12 +244,12 @@ public final class NBTOutputStream implements Closeable {
this.os.writeInt(element);
}
}
@Override
public void close() throws IOException {
this.os.close();
}
/**
* Flush output
* @throws IOException

23
Core/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java
View File

@ -6,11 +6,13 @@ import java.util.Map;
* A class which contains NBT-related utility methods.
*/
public final class NBTUtils {
/**
* Default private constructor.
*/
private NBTUtils() {}
private NBTUtils() {
}
/**
* Gets the type name of a tag.
*
@ -18,7 +20,7 @@ public final class NBTUtils {
*
* @return The type name.
*/
public static String getTypeName(final Class<? extends Tag> clazz) {
public static String getTypeName(Class<? extends Tag> clazz) {
if (clazz.equals(ByteArrayTag.class)) {
return "TAG_Byte_Array";
} else if (clazz.equals(ByteTag.class)) {
@ -47,7 +49,7 @@ public final class NBTUtils {
throw new IllegalArgumentException("Invalid tag class (" + clazz.getName() + ").");
}
}
/**
* Gets the type code of a tag class.
*
@ -57,7 +59,7 @@ public final class NBTUtils {
*
* @throws IllegalArgumentException if the tag class is invalid.
*/
public static int getTypeCode(final Class<? extends Tag> clazz) {
public static int getTypeCode(Class<? extends Tag> clazz) {
if (clazz.equals(ByteArrayTag.class)) {
return NBTConstants.TYPE_BYTE_ARRAY;
} else if (clazz.equals(ByteTag.class)) {
@ -86,7 +88,7 @@ public final class NBTUtils {
throw new IllegalArgumentException("Invalid tag class (" + clazz.getName() + ").");
}
}
/**
* Gets the class of a type of tag.
*
@ -96,7 +98,7 @@ public final class NBTUtils {
*
* @throws IllegalArgumentException if the tag type is invalid.
*/
public static Class<? extends Tag> getTypeClass(final int type) {
public static Class<? extends Tag> getTypeClass(int type) {
switch (type) {
case NBTConstants.TYPE_END:
return EndTag.class;
@ -126,7 +128,7 @@ public final class NBTUtils {
throw new IllegalArgumentException("Invalid tag type : " + type + ".");
}
}
/**
* Get child tag of a NBT structure.
*
@ -137,11 +139,12 @@ public final class NBTUtils {
*
* @return child tag
*/
public static <T extends Tag> T getChildTag(final Map<String, Tag> items, final String key, final Class<T> expected) throws IllegalArgumentException {
public static <T extends Tag> T getChildTag(Map<String, Tag> items, String key, Class<T> expected)
throws IllegalArgumentException {
if (!items.containsKey(key)) {
throw new IllegalArgumentException("Missing a \"" + key + "\" tag");
}
final Tag tag = items.get(key);
Tag tag = items.get(key);
if (!expected.isInstance(tag)) {
throw new IllegalArgumentException(key + " tag is not of tag type " + expected.getName());
}

22
Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java
View File

@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
* The {@code TAG_Short} tag.
*/
public final class ShortTag extends Tag {
private final short value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public ShortTag(final short value) {
super();
public ShortTag(short value) {
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public ShortTag(final String name, final short value) {
public ShortTag(String name, short value) {
super(name);
this.value = value;
}
@Override
public Short getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_Short" + append + ": " + value;
return "TAG_Short" + append + ": " + this.value;
}
}

22
Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java
View File

@ -6,43 +6,43 @@ import static com.google.common.base.Preconditions.checkNotNull;
* The {@code TAG_String} tag.
*/
public final class StringTag extends Tag {
private final String value;
/**
* Creates the tag with an empty name.
*
* @param value the value of the tag
*/
public StringTag(final String value) {
super();
public StringTag(String value) {
checkNotNull(value);
this.value = value;
}
/**
* Creates the tag.
*
* @param name the name of the tag
* @param value the value of the tag
*/
public StringTag(final String name, final String value) {
public StringTag(String name, String value) {
super(name);
checkNotNull(value);
this.value = value;
}
@Override
public String getValue() {
return value;
return this.value;
}
@Override
public String toString() {
final String name = getName();
String name = getName();
String append = "";
if ((name != null) && !name.equals("")) {
if (name != null && !name.equals("")) {
append = "(\"" + getName() + "\")";
}
return "TAG_String" + append + ": " + value;
return "TAG_String" + append + ": " + this.value;
}
}

11
Core/src/main/java/com/intellectualcrafters/jnbt/Tag.java
View File

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

170
Core/src/main/java/com/intellectualcrafters/json/JSONArray.java
View File

@ -46,7 +46,7 @@ public class JSONArray {
* Construct an empty JSONArray.
*/
public JSONArray() {
myArrayList = new ArrayList<Object>();
this.myArrayList = new ArrayList<Object>();
}
/**
@ -56,7 +56,7 @@ public class JSONArray {
*
* @throws JSONException If there is a syntax error.
*/
public JSONArray(final JSONTokener x) throws JSONException {
public JSONArray(JSONTokener x) throws JSONException {
this();
if (x.nextClean() != '[') {
throw x.syntaxError("A JSONArray text must start with '['");
@ -66,10 +66,10 @@ public class JSONArray {
for (;;) {
if (x.nextClean() == ',') {
x.back();
myArrayList.add(JSONObject.NULL);
this.myArrayList.add(JSONObject.NULL);
} else {
x.back();
myArrayList.add(x.nextValue());
this.myArrayList.add(x.nextValue());
}
switch (x.nextClean()) {
case ',':
@ -95,7 +95,7 @@ public class JSONArray {
*
* @throws JSONException If there is a syntax error.
*/
public JSONArray(final String source) throws JSONException {
public JSONArray(String source) throws JSONException {
this(new JSONTokener(source));
}
@ -104,11 +104,11 @@ public class JSONArray {
*
* @param collection A Collection.
*/
public JSONArray(final Collection<Object> collection) {
myArrayList = new ArrayList<Object>();
public JSONArray(Collection<Object> collection) {
this.myArrayList = new ArrayList<Object>();
if (collection != null) {
for (final Object aCollection : collection) {
myArrayList.add(JSONObject.wrap(aCollection));
for (Object aCollection : collection) {
this.myArrayList.add(JSONObject.wrap(aCollection));
}
}
}
@ -118,10 +118,10 @@ public class JSONArray {
*
* @throws JSONException If not an array.
*/
public JSONArray(final Object array) throws JSONException {
public JSONArray(Object array) throws JSONException {
this();
if (array.getClass().isArray()) {
final int length = Array.getLength(array);
int length = Array.getLength(array);
for (int i = 0; i < length; i += 1) {
this.put(JSONObject.wrap(Array.get(array, i)));
}
@ -139,8 +139,8 @@ public class JSONArray {
*
* @throws JSONException If there is no value for the index.
*/
public Object get(final int index) throws JSONException {
final Object object = opt(index);
public Object get(int index) throws JSONException {
Object object = opt(index);
if (object == null) {
throw new JSONException("JSONArray[" + index + "] not found.");
}
@ -156,8 +156,8 @@ public class JSONArray {
*
* @throws JSONException If there is no value for the index or if the value is not convertible to boolean.
*/
public boolean getBoolean(final int index) throws JSONException {
final Object object = get(index);
public boolean getBoolean(int index) throws JSONException {
Object object = get(index);
if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("false"))) {
return false;
} else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) {
@ -175,8 +175,8 @@ public class JSONArray {
*
* @throws JSONException If the key is not found or if the value cannot be converted to a number.
*/
public double getDouble(final int index) throws JSONException {
final Object object = get(index);
public double getDouble(int index) throws JSONException {
Object object = get(index);
try {
return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object);
} catch (NumberFormatException e) {
@ -193,8 +193,8 @@ public class JSONArray {
*
* @throws JSONException If the key is not found or if the value is not a number.
*/
public int getInt(final int index) throws JSONException {
final Object object = get(index);
public int getInt(int index) throws JSONException {
Object object = get(index);
try {
return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object);
} catch (NumberFormatException e) {
@ -211,8 +211,8 @@ public class JSONArray {
*
* @throws JSONException If there is no value for the index. or if the value is not a JSONArray
*/
public JSONArray getJSONArray(final int index) throws JSONException {
final Object object = get(index);
public JSONArray getJSONArray(int index) throws JSONException {
Object object = get(index);
if (object instanceof JSONArray) {
return (JSONArray) object;
}
@ -228,8 +228,8 @@ public class JSONArray {
*
* @throws JSONException If there is no value for the index or if the value is not a JSONObject
*/
public JSONObject getJSONObject(final int index) throws JSONException {
final Object object = get(index);
public JSONObject getJSONObject(int index) throws JSONException {
Object object = get(index);
if (object instanceof JSONObject) {
return (JSONObject) object;
}
@ -245,8 +245,8 @@ public class JSONArray {
*
* @throws JSONException If the key is not found or if the value cannot be converted to a number.
*/
public long getLong(final int index) throws JSONException {
final Object object = get(index);
public long getLong(int index) throws JSONException {
Object object = get(index);
try {
return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object);
} catch (NumberFormatException e) {
@ -263,8 +263,8 @@ public class JSONArray {
*
* @throws JSONException If there is no string value for the index.
*/
public String getString(final int index) throws JSONException {
final Object object = get(index);
public String getString(int index) throws JSONException {
Object object = get(index);
if (object instanceof String) {
return (String) object;
}
@ -278,7 +278,7 @@ public class JSONArray {
*
* @return true if the value at the index is null, or if there is no value.
*/
public boolean isNull(final int index) {
public boolean isNull(int index) {
return JSONObject.NULL.equals(opt(index));
}
@ -292,14 +292,14 @@ public class JSONArray {
*
* @throws JSONException If the array contains an invalid number.
*/
public String join(final String separator) throws JSONException {
final int len = length();
final StringBuilder sb = new StringBuilder();
public String join(String separator) throws JSONException {
int len = length();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < len; i += 1) {
if (i > 0) {
sb.append(separator);
}
sb.append(JSONObject.valueToString(myArrayList.get(i)));
sb.append(JSONObject.valueToString(this.myArrayList.get(i)));
}
return sb.toString();
}
@ -310,7 +310,7 @@ public class JSONArray {
* @return The length (or size).
*/
public int length() {
return myArrayList.size();
return this.myArrayList.size();
}
/**
@ -320,8 +320,8 @@ public class JSONArray {
*
* @return An object value, or null if there is no object at that index.
*/
public Object opt(final int index) {
return ((index < 0) || (index >= length())) ? null : myArrayList.get(index);
public Object opt(int index) {
return ((index < 0) || (index >= length())) ? null : this.myArrayList.get(index);
}
/**
@ -332,7 +332,7 @@ public class JSONArray {
*
* @return The truth.
*/
public boolean optBoolean(final int index) {
public boolean optBoolean(int index) {
return this.optBoolean(index, false);
}
@ -345,7 +345,7 @@ public class JSONArray {
*
* @return The truth.
*/
public boolean optBoolean(final int index, final boolean defaultValue) {
public boolean optBoolean(int index, boolean defaultValue) {
try {
return getBoolean(index);
} catch (JSONException e) {
@ -361,7 +361,7 @@ public class JSONArray {
*
* @return The value.
*/
public double optDouble(final int index) {
public double optDouble(int index) {
return this.optDouble(index, Double.NaN);
}
@ -374,7 +374,7 @@ public class JSONArray {
*
* @return The value.
*/
public double optDouble(final int index, final double defaultValue) {
public double optDouble(int index, double defaultValue) {
try {
return getDouble(index);
} catch (JSONException e) {
@ -390,7 +390,7 @@ public class JSONArray {
*
* @return The value.
*/
public int optInt(final int index) {
public int optInt(int index) {
return this.optInt(index, 0);
}
@ -403,7 +403,7 @@ public class JSONArray {
*
* @return The value.
*/
public int optInt(final int index, final int defaultValue) {
public int optInt(int index, int defaultValue) {
try {
return getInt(index);
} catch (JSONException e) {
@ -418,8 +418,8 @@ public class JSONArray {
*
* @return A JSONArray value, or null if the index has no value, or if the value is not a JSONArray.
*/
public JSONArray optJSONArray(final int index) {
final Object o = opt(index);
public JSONArray optJSONArray(int index) {
Object o = opt(index);
return o instanceof JSONArray ? (JSONArray) o : null;
}
@ -431,8 +431,8 @@ public class JSONArray {
*
* @return A JSONObject value.
*/
public JSONObject optJSONObject(final int index) {
final Object o = opt(index);
public JSONObject optJSONObject(int index) {
Object o = opt(index);
return o instanceof JSONObject ? (JSONObject) o : null;
}
@ -444,7 +444,7 @@ public class JSONArray {
*
* @return The value.
*/
public long optLong(final int index) {
public long optLong(int index) {
return this.optLong(index, 0);
}
@ -457,7 +457,7 @@ public class JSONArray {
*
* @return The value.
*/
public long optLong(final int index, final long defaultValue) {
public long optLong(int index, long defaultValue) {
try {
return getLong(index);
} catch (JSONException e) {
@ -467,13 +467,13 @@ public class JSONArray {
/**
* 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 converted to a string.
*
* @param index The index must be between 0 and length() - 1.
*
* @return A String value.
*/
public String optString(final int index) {
public String optString(int index) {
return this.optString(index, "");
}
@ -485,8 +485,8 @@ public class JSONArray {
*
* @return A String value.
*/
public String optString(final int index, final String defaultValue) {
final Object object = opt(index);
public String optString(int index, String defaultValue) {
Object object = opt(index);
return JSONObject.NULL.equals(object) ? defaultValue : object.toString();
}
@ -497,7 +497,7 @@ public class JSONArray {
*
* @return this.
*/
public JSONArray put(final boolean value) {
public JSONArray put(boolean value) {
this.put(value ? Boolean.TRUE : Boolean.FALSE);
return this;
}
@ -509,7 +509,7 @@ public class JSONArray {
*
* @return this.
*/
public JSONArray put(final Collection<Object> value) {
public JSONArray put(Collection<Object> value) {
this.put(new JSONArray(value));
return this;
}
@ -523,8 +523,8 @@ public class JSONArray {
*
* @throws JSONException if the value is not finite.
*/
public JSONArray put(final double value) throws JSONException {
final Double d = value;
public JSONArray put(double value) throws JSONException {
Double d = value;
JSONObject.testValidity(d);
this.put(d);
return this;
@ -537,7 +537,7 @@ public class JSONArray {
*
* @return this.
*/
public JSONArray put(final int value) {
public JSONArray put(int value) {
this.put(Integer.valueOf(value));
return this;
}
@ -549,7 +549,7 @@ public class JSONArray {
*
* @return this.
*/
public JSONArray put(final long value) {
public JSONArray put(long value) {
this.put(Long.valueOf(value));
return this;
}
@ -561,7 +561,7 @@ public class JSONArray {
*
* @return this.
*/
public JSONArray put(final Map<String, Object> value) {
public JSONArray put(Map<String, Object> value) {
this.put(new JSONObject(value));
return this;
}
@ -574,8 +574,8 @@ public class JSONArray {
*
* @return this.
*/
public JSONArray put(final Object value) {
myArrayList.add(value);
public JSONArray put(Object value) {
this.myArrayList.add(value);
return this;
}
@ -590,7 +590,7 @@ public class JSONArray {
*
* @throws JSONException If the index is negative.
*/
public JSONArray put(final int index, final boolean value) throws JSONException {
public JSONArray put(int index, boolean value) throws JSONException {
this.put(index, value ? Boolean.TRUE : Boolean.FALSE);
return this;
}
@ -605,7 +605,7 @@ public class JSONArray {
*
* @throws JSONException If the index is negative or if the value is not finite.
*/
public JSONArray put(final int index, final Collection<Object> value) throws JSONException {
public JSONArray put(int index, Collection<Object> value) throws JSONException {
this.put(index, new JSONArray(value));
return this;
}
@ -621,7 +621,7 @@ public class JSONArray {
*
* @throws JSONException If the index is negative or if the value is not finite.
*/
public JSONArray put(final int index, final double value) throws JSONException {
public JSONArray put(int index, double value) throws JSONException {
this.put(index, new Double(value));
return this;
}
@ -637,7 +637,7 @@ public class JSONArray {
*
* @throws JSONException If the index is negative.
*/
public JSONArray put(final int index, final int value) throws JSONException {
public JSONArray put(int index, int value) throws JSONException {
this.put(index, Integer.valueOf(value));
return this;
}
@ -653,7 +653,7 @@ public class JSONArray {
*
* @throws JSONException If the index is negative.
*/
public JSONArray put(final int index, final long value) throws JSONException {
public JSONArray put(int index, long value) throws JSONException {
this.put(index, Long.valueOf(value));
return this;
}
@ -668,7 +668,7 @@ public class JSONArray {
*
* @throws JSONException If the index is negative or if the the value is an invalid number.
*/
public JSONArray put(final int index, final Map<String, Object> value) throws JSONException {
public JSONArray put(int index, Map<String, Object> value) throws JSONException {
this.put(index, new JSONObject(value));
return this;
}
@ -685,13 +685,13 @@ public class JSONArray {
*
* @throws JSONException If the index is negative or if the the value is an invalid number.
*/
public JSONArray put(final int index, final Object value) throws JSONException {
public JSONArray put(int index, Object value) throws JSONException {
JSONObject.testValidity(value);
if (index < 0) {
throw new JSONException("JSONArray[" + index + "] not found.");
}
if (index < length()) {
myArrayList.set(index, value);
this.myArrayList.set(index, value);
} else {
while (index != length()) {
this.put(JSONObject.NULL);
@ -708,8 +708,8 @@ public class JSONArray {
*
* @return The value that was associated with the index, or null if there was no value.
*/
public Object remove(final int index) {
return (index >= 0) && (index < length()) ? myArrayList.remove(index) : null;
public Object remove(int index) {
return (index >= 0) && (index < length()) ? this.myArrayList.remove(index) : null;
}
/**
@ -719,17 +719,17 @@ public class JSONArray {
*
* @return true if they are equal
*/
public boolean similar(final Object other) {
public boolean similar(Object other) {
if (!(other instanceof JSONArray)) {
return false;
}
final int len = length();
int len = length();
if (len != ((JSONArray) other).length()) {
return false;
}
for (int i = 0; i < len; i += 1) {
final Object valueThis = get(i);
final Object valueOther = ((JSONArray) other).get(i);
Object valueThis = get(i);
Object valueOther = ((JSONArray) other).get(i);
if (valueThis instanceof JSONObject) {
if (!((JSONObject) valueThis).similar(valueOther)) {
return false;
@ -754,11 +754,11 @@ public class JSONArray {
*
* @throws JSONException If any of the names are null.
*/
public JSONObject toJSONObject(final JSONArray names) throws JSONException {
public JSONObject toJSONObject(JSONArray names) throws JSONException {
if ((names == null) || (names.length() == 0) || (length() == 0)) {
return null;
}
final JSONObject jo = new JSONObject();
JSONObject jo = new JSONObject();
for (int i = 0; i < names.length(); i += 1) {
jo.put(names.getString(i), opt(i));
}
@ -795,8 +795,8 @@ public class JSONArray {
*
* @throws JSONException
*/
public String toString(final int indentFactor) throws JSONException {
final StringWriter sw = new StringWriter();
public String toString(int indentFactor) throws JSONException {
StringWriter sw = new StringWriter();
synchronized (sw.getBuffer()) {
return this.write(sw, indentFactor, 0).toString();
}
@ -811,7 +811,7 @@ public class JSONArray {
*
* @throws JSONException
*/
public Writer write(final Writer writer) throws JSONException {
public Writer write(Writer writer) throws JSONException {
return this.write(writer, 0, 0);
}
@ -827,15 +827,15 @@ public class JSONArray {
*
* @throws JSONException
*/
Writer write(final Writer writer, final int indentFactor, final int indent) throws JSONException {
Writer write(Writer writer, int indentFactor, int indent) throws JSONException {
try {
boolean commanate = false;
final int length = length();
int length = length();
writer.write('[');
if (length == 1) {
JSONObject.writeValue(writer, myArrayList.get(0), indentFactor, indent);
JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent);
} else if (length != 0) {
final int newindent = indent + indentFactor;
int newindent = indent + indentFactor;
for (int i = 0; i < length; i += 1) {
if (commanate) {
writer.write(',');
@ -844,7 +844,7 @@ public class JSONArray {
writer.write('\n');
}
JSONObject.indent(writer, newindent);
JSONObject.writeValue(writer, myArrayList.get(i), indentFactor, newindent);
JSONObject.writeValue(writer, this.myArrayList.get(i), indentFactor, newindent);
commanate = true;
}
if (indentFactor > 0) {
@ -854,7 +854,7 @@ public class JSONArray {
}
writer.write(']');
return writer;
} catch (final IOException e) {
} catch (IOException e) {
throw new JSONException(e);
}
}

44
Core/src/main/java/com/intellectualcrafters/plot/IPlotMain.java
View File

@ -24,26 +24,26 @@ public interface IPlotMain {
/**
* Log a message to console.
* @param message
* @param message The message to log
*/
void log(String message);
/**
* Get the `PlotSquared` directory.
* @return
* @return The plugin directory
*/
File getDirectory();
/**
* Get the directory containing all the worlds.
* @return
* @return The directory containing the worlds
*/
File getWorldContainer();
/**
* Wrap a player into a PlotPlayer object.
* @param player
* @return
* @param player The player to convert to a PlotPlayer
* @return A PlotPlayer
*/
PlotPlayer wrapPlayer(Object player);
@ -69,20 +69,20 @@ public interface IPlotMain {
int[] getServerVersion();
/**
* Get the nms package prefix.
* @return
* Get the NMS package prefix.
* @return The NMS package prefix
*/
String getNMSPackage();
/**
* Get the schematic handler.
* @return
* @return The {@link SchematicHandler}
*/
SchematicHandler initSchematicHandler();
/**
* Get the schematic handler.
* @return
* Get the Chat Manager.
* @return The {@link ChatManager}
*/
ChatManager initChatManager();
@ -176,24 +176,27 @@ public interface IPlotMain {
/**
* If a world is already loaded, set the generator (use NMS if required).
* @param world
* @param world The world to set the generator
*/
void setGenerator(String world);
/**
* Get the {@link UUIDHandlerImplementation} which will cache and provide UUIDs.
* Get the {@link UUIDHandlerImplementation} which will cache and
* provide UUIDs.
* @return
*/
UUIDHandlerImplementation initUUIDHandler();
/**
* Get the {@link InventoryUtil} class (used for implementation specific inventory guis).
* Get the {@link InventoryUtil} class (used for implementation specific
* inventory guis).
* @return
*/
InventoryUtil initInventoryUtil();
/**
* Run the converter for the implementation (not necessarily PlotMe, just any plugin that we can convert from).
* Run the converter for the implementation (not necessarily PlotMe, just
* any plugin that we can convert from).
* @return
*/
boolean initPlotMeConverter();
@ -212,26 +215,23 @@ public interface IPlotMain {
*/
GeneratorWrapper<?> getGenerator(String world, String name);
/**
*
* @param generator
* @return
*/
GeneratorWrapper<?> wrapPlotGenerator(IndependentPlotGenerator generator);
/**
* Register the chunk processor which will clean out chunks that have too many blockstates or entities.
* Register the chunk processor which will clean out chunks that have too
* many blockstates or entities.
*/
void registerChunkProcessor();
/**
* Register the world initialization events (used to keep track of worlds being generated).
* Register the world initialization events (used to keep track of worlds
* being generated).
*/
void registerWorldEvents();
/**
* Get the name of the server.
* @return
* @return The server name
*/
String getServerName();

300
Core/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -53,6 +53,7 @@ import com.intellectualcrafters.plot.util.WorldUtil;
import com.intellectualcrafters.plot.util.area.QuadMap;
import com.plotsquared.listener.WESubscriber;
import com.sk89q.worldedit.WorldEdit;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@ -89,11 +90,11 @@ import java.util.zip.ZipInputStream;
public class PS {
private static PS instance;
private final HashSet<Integer> plotareaHashCheck = new HashSet<>();
private final HashSet<Integer> plotAreaHashCheck = new HashSet<>();
/**
* All plot areas mapped by world (quick world access).
*/
private final HashMap<String, PlotArea[]> plotareamap = new HashMap<>();
private final HashMap<String, PlotArea[]> plotAreaMap = new HashMap<>();
/**
* All plot areas mapped by location (quick location based access).
*/
@ -112,7 +113,7 @@ public class PS {
public TaskManager TASK;
public WorldEdit worldedit;
public URL update;
private boolean plotareaHasCollision = false;
private boolean plotAreaHasCollision = false;
/**
* All plot areas (quick global access).
*/
@ -132,7 +133,7 @@ public class PS {
*/
public PS(IPlotMain imp_class, String platform) {
try {
instance = this;
PS.instance = this;
this.thread = Thread.currentThread();
SetupUtils.generators = new HashMap<>();
this.IMP = imp_class;
@ -150,16 +151,16 @@ public class PS {
this.version = this.IMP.getPluginVersion();
this.platform = platform;
if (getJavaVersion() < 1.7) {
log(C.CONSOLE_JAVA_OUTDATED_1_7);
PS.log(C.CONSOLE_JAVA_OUTDATED_1_7);
this.IMP.disable();
return;
}
if (getJavaVersion() < 1.8) {
log(C.CONSOLE_JAVA_OUTDATED_1_8);
PS.log(C.CONSOLE_JAVA_OUTDATED_1_8);
}
this.TASK = this.IMP.getTaskManager();
if (!C.ENABLED.s().isEmpty()) {
log(C.ENABLED);
PS.log(C.ENABLED);
}
setupConfigs();
this.translationFile = new File(this.IMP.getDirectory() + File.separator + "translations" + File.separator + "PlotSquared.use_THIS.yml");
@ -187,7 +188,7 @@ public class PS {
if (Settings.METRICS) {
this.IMP.startMetrics();
} else {
log(C.CONSOLE_PLEASE_ENABLE_METRICS);
PS.log(C.CONSOLE_PLEASE_ENABLE_METRICS);
}
if (Settings.CHUNK_PROCESSOR) {
this.IMP.registerChunkProcessor();
@ -197,7 +198,7 @@ public class PS {
TaskManager.runTaskLater(new Runnable() {
@Override
public void run() {
PS.debug("Starting UUID caching");
debug("Starting UUID caching");
UUIDHandler.startCaching(new Runnable() {
@Override
public void run() {
@ -224,11 +225,11 @@ public class PS {
@Override
public void run() {
if (PS.this.IMP.initPlotMeConverter()) {
log("&c=== IMPORTANT ===");
log("&cTHIS MESSAGE MAY BE EXTREMELY HELPFUL IF YOU HAVE TROUBLE CONVERTING PLOTME!");
log("&c - Make sure 'UUID.read-from-disk' is disabled (false)!");
log("&c - Sometimes the database can be locked, deleting PlotMe.jar beforehand will fix the issue!");
log("&c - After the conversion is finished, please set 'plotme-convert.enabled' to false in the "
PS.log("&c=== IMPORTANT ===");
PS.log("&cTHIS MESSAGE MAY BE EXTREMELY HELPFUL IF YOU HAVE TROUBLE CONVERTING PLOTME!");
PS.log("&c - Make sure 'UUID.read-from-disk' is disabled (false)!");
PS.log("&c - Sometimes the database can be locked, deleting PlotMe.jar beforehand will fix the issue!");
PS.log("&c - After the conversion is finished, please set 'plotme-convert.enabled' to false in the "
+ "'settings.yml'");
}
}
@ -274,9 +275,10 @@ public class PS {
if (url != null) {
PS.this.update = url;
} else if (PS.this.lastVersion == null) {
log("&aThanks for installing PlotSquared!");
} else if (!PS.get().checkVersion(PS.this.lastVersion, PS.this.version)) {
log("&aThanks for updating from " + StringMan.join(PS.this.lastVersion, ".") + " to " + StringMan.join(PS.this.version, ".")
PS.log("&aThanks for installing PlotSquared!");
} else if (!get().checkVersion(PS.this.lastVersion, PS.this.version)) {
PS.log("&aThanks for updating from " + StringMan.join(PS.this.lastVersion, ".") + " to " + StringMan
.join(PS.this.version, ".")
+ "!");
DBFunc.dbManager.updateTables(PS.this.lastVersion);
}
@ -302,11 +304,11 @@ public class PS {
continue;
}
if (!WorldUtil.IMP.isWorld(world)) {
PS.debug("&c`" + world + "` was not properly loaded - PlotSquared will now try to load it properly: ");
PS.debug(
debug("&c`" + world + "` was not properly loaded - PlotSquared will now try to load it properly: ");
debug(
"&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and "
+ "multiverse worlds.yml");
PS.debug("&8 - &7Your world management plugin may be faulty (or non existant)");
debug("&8 - &7Your world management plugin may be faulty (or non existent)");
PS.this.IMP.setGenerator(world);
}
}
@ -334,7 +336,7 @@ public class PS {
* @return the instance created by IPlotMain
*/
public static PS get() {
return instance;
return PS.instance;
}
/**
@ -344,7 +346,7 @@ public class PS {
* @see IPlotMain#log(String)
*/
public static void log(Object message) {
get().IMP.log(StringMan.getString(message));
PS.get().IMP.log(StringMan.getString(message));
}
public static void stacktrace() {
@ -359,7 +361,7 @@ public class PS {
*/
public static void debug(Object message) {
if (Settings.DEBUG) {
log(message);
PS.log(message);
}
}
@ -441,14 +443,14 @@ public class PS {
int hash = world.hashCode();
for (PlotArea area : this.plotAreas) {
if (hash == area.worldhash) {
if (area.contains(location.getX(), location.getZ()) && (!this.plotareaHasCollision || world.equals(area.worldname))) {
if (area.contains(location.getX(), location.getZ()) && (!this.plotAreaHasCollision || world.equals(area.worldname))) {
return area;
}
}
}
return null;
default:
PlotArea[] areas = this.plotareamap.get(location.getWorld());
PlotArea[] areas = this.plotAreaMap.get(location.getWorld());
if (areas == null) {
return null;
}
@ -480,7 +482,7 @@ public class PS {
}
public PlotArea getPlotArea(String world, String id) {
PlotArea[] areas = this.plotareamap.get(world);
PlotArea[] areas = this.plotAreaMap.get(world);
if (areas == null) {
return null;
}
@ -499,7 +501,7 @@ public class PS {
}
public PlotArea getPlotAreaAbs(String world, String id) {
PlotArea[] areas = this.plotareamap.get(world);
PlotArea[] areas = this.plotAreaMap.get(world);
if (areas == null) {
return null;
}
@ -513,7 +515,7 @@ public class PS {
public PlotArea getPlotAreaByString(String search) {
String[] split = search.split(";|,");
PlotArea[] areas = this.plotareamap.get(split[0]);
PlotArea[] areas = this.plotAreaMap.get(split[0]);
if (areas == null) {
for (PlotArea area : this.plotAreas) {
if (area.worldname.equalsIgnoreCase(split[0])) {
@ -570,14 +572,14 @@ public class PS {
int hash = world.hashCode();
for (PlotArea area : this.plotAreas) {
if (hash == area.worldhash) {
if (area.contains(location.getX(), location.getZ()) && (!this.plotareaHasCollision || world.equals(area.worldname))) {
if (area.contains(location.getX(), location.getZ()) && (!this.plotAreaHasCollision || world.equals(area.worldname))) {
return area;
}
}
}
return null;
default:
PlotArea[] areas = this.plotareamap.get(location.getWorld());
PlotArea[] areas = this.plotAreaMap.get(location.getWorld());
if (areas == null) {
return null;
}
@ -630,13 +632,13 @@ public class PS {
if (plotArea.TYPE == 2) {
plots = this.plots_tmp.get(plotArea.worldname);
if (plots != null) {
Iterator<Entry<PlotId, Plot>> iter = plots.entrySet().iterator();
while (iter.hasNext()) {
Entry<PlotId, Plot> next = iter.next();
Iterator<Entry<PlotId, Plot>> iterator = plots.entrySet().iterator();
while (iterator.hasNext()) {
Entry<PlotId, Plot> next = iterator.next();
PlotId id = next.getKey();
if (plotArea.contains(id)) {
next.getValue().setArea(plotArea);
iter.remove();
iterator.remove();
}
}
}
@ -652,12 +654,12 @@ public class PS {
if (plotArea.TYPE == 2) {
clusters = this.clusters_tmp.get(plotArea.worldname);
if (clusters != null) {
Iterator<PlotCluster> iter = clusters.iterator();
while (iter.hasNext()) {
PlotCluster next = iter.next();
Iterator<PlotCluster> iterator = clusters.iterator();
while (iterator.hasNext()) {
PlotCluster next = iterator.next();
if (next.intersects(plotArea.getMin(), plotArea.getMax())) {
next.setArea(plotArea);
iter.remove();
iterator.remove();
}
}
}
@ -672,7 +674,7 @@ public class PS {
localAreas.add(plotArea);
globalAreas.add(plotArea);
this.plotAreas = globalAreas.toArray(new PlotArea[globalAreas.size()]);
this.plotareamap.put(plotArea.worldname, localAreas.toArray(new PlotArea[localAreas.size()]));
this.plotAreaMap.put(plotArea.worldname, localAreas.toArray(new PlotArea[localAreas.size()]));
QuadMap<PlotArea> map = this.plotAreaGrid.get(plotArea.worldname);
if (map == null) {
map = new QuadMap<PlotArea>(Integer.MAX_VALUE, 0, 0) {
@ -697,10 +699,10 @@ public class PS {
areas.remove(area);
this.plotAreas = areas.toArray(new PlotArea[areas.size()]);
if (areas.isEmpty()) {
this.plotareamap.remove(area.worldname);
this.plotAreaMap.remove(area.worldname);
this.plotAreaGrid.remove(area.worldname);
} else {
this.plotareamap.put(area.worldname, areas.toArray(new PlotArea[areas.size()]));
this.plotAreaMap.put(area.worldname, areas.toArray(new PlotArea[areas.size()]));
this.plotAreaGrid.get(area.worldname).remove(area);
}
setPlotsTmp(area);
@ -922,26 +924,26 @@ public class PS {
@Deprecated
public ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
int hardmax = 256000;
int hardMax = 256000;
int max = 0;
int overflowSize = 0;
for (Plot plot : plots) {
int hash = MathMan.getPositiveId(plot.hashCode());
if (hash > max) {
if (hash >= hardmax) {
if (hash >= hardMax) {
overflowSize++;
} else {
max = hash;
}
}
}
hardmax = Math.min(hardmax, max);
Plot[] cache = new Plot[hardmax + 1];
hardMax = Math.min(hardMax, max);
Plot[] cache = new Plot[hardMax + 1];
List<Plot> overflow = new ArrayList<>(overflowSize);
ArrayList<Plot> extra = new ArrayList<>();
for (Plot plot : plots) {
int hash = MathMan.getPositiveId(plot.hashCode());
if (hash < hardmax) {
if (hash < hardMax) {
if (hash >= 0) {
cache[hash] = plot;
} else {
@ -1025,17 +1027,17 @@ public class PS {
/**
* Sort a collection of plots by world (with a priority world), then by hashcode.
* @param myplots
* @param myPlots
* @param type The sorting method to use for each world (timestamp, or hash)
* @param priorityArea Use null, "world", or "gibberish" if you want default world order
* @return ArrayList of plot
*/
public ArrayList<Plot> sortPlots(Collection<Plot> myplots, SortType type, final PlotArea priorityArea) {
public ArrayList<Plot> sortPlots(Collection<Plot> myPlots, SortType type, final PlotArea priorityArea) {
// group by world
// sort each
HashMap<PlotArea, Collection<Plot>> map = new HashMap<>();
int totalSize = getPlotCount();
if (myplots.size() == totalSize) {
if (myPlots.size() == totalSize) {
for (PlotArea area : this.plotAreas) {
map.put(area, area.getPlots());
}
@ -1045,7 +1047,7 @@ public class PS {
}
Collection<Plot> lastList = null;
PlotArea lastWorld = null;
for (Plot plot : myplots) {
for (Plot plot : myPlots) {
if (lastWorld == plot.getArea()) {
lastList.add(plot);
} else {
@ -1065,7 +1067,7 @@ public class PS {
return a.hashCode() - b.hashCode();
}
});
ArrayList<Plot> toReturn = new ArrayList<>(myplots.size());
ArrayList<Plot> toReturn = new ArrayList<>(myPlots.size());
for (PlotArea area : areas) {
switch (type) {
case CREATION_DATE:
@ -1137,15 +1139,15 @@ public class PS {
* @return Set of plot
*/
public Set<Plot> getPlots(String world, UUID uuid) {
ArrayList<Plot> myplots = new ArrayList<>();
ArrayList<Plot> myPlots = new ArrayList<>();
for (Plot plot : getPlots(world)) {
if (plot.hasOwner()) {
if (plot.isOwnerAbs(uuid)) {
myplots.add(plot);
myPlots.add(plot);
}
}
}
return new HashSet<>(myplots);
return new HashSet<>(myPlots);
}
/**
@ -1175,7 +1177,7 @@ public class PS {
*/
@Deprecated
public boolean isPlotWorld(String world) {
return this.plotareamap.containsKey(world);
return this.plotAreaMap.containsKey(world);
}
/**
@ -1190,7 +1192,7 @@ public class PS {
return false;
case 1:
PlotArea a = this.plotAreas[0];
return world.hashCode() == a.worldhash && (!this.plotareaHasCollision || a.worldname.equals(world));
return world.hashCode() == a.worldhash && (!this.plotAreaHasCollision || a.worldname.equals(world));
case 2:
case 3:
case 4:
@ -1200,13 +1202,13 @@ public class PS {
case 8:
int hash = world.hashCode();
for (PlotArea area : this.plotAreas) {
if (area.worldhash == hash && (!this.plotareaHasCollision || area.worldname.equals(world))) {
if (area.worldhash == hash && (!this.plotAreaHasCollision || area.worldname.equals(world))) {
return true;
}
}
return false;
default:
return this.plotareamap.containsKey(world);
return this.plotAreaMap.containsKey(world);
}
}
@ -1248,16 +1250,16 @@ public class PS {
* @return Set of Plot
*/
public Set<Plot> getPlots(final UUID uuid) {
final ArrayList<Plot> myplots = new ArrayList<>();
final ArrayList<Plot> myPlots = new ArrayList<>();
foreachPlot(new RunnableVal<Plot>() {
@Override
public void run(Plot value) {
if (value.isOwnerAbs(uuid)) {
myplots.add(value);
myPlots.add(value);
}
}
});
return new HashSet<>(myplots);
return new HashSet<>(myPlots);
}
public Set<Plot> getBasePlots(final UUID uuid) {
@ -1274,21 +1276,21 @@ public class PS {
}
/**
* Get the plots for a UUID
* @param uuid
* Get the plots for a UUID.
* @param uuid The UUID of the owner
* @return Set of Plot
*/
public Set<Plot> getPlotsAbs(final UUID uuid) {
final ArrayList<Plot> myplots = new ArrayList<>();
final ArrayList<Plot> myPlots = new ArrayList<>();
foreachPlot(new RunnableVal<Plot>() {
@Override
public void run(Plot value) {
if (value.isOwnerAbs(uuid)) {
myplots.add(value);
myPlots.add(value);
}
}
});
return new HashSet<>(myplots);
return new HashSet<>(myPlots);
}
/**
@ -1332,16 +1334,16 @@ public class PS {
if (world.equals("CheckingPlotSquaredGenerator")) {
return;
}
if (!this.plotareaHasCollision && !this.plotareaHashCheck.add(world.hashCode())) {
this.plotareaHasCollision = true;
if (!this.plotAreaHasCollision && !this.plotAreaHashCheck.add(world.hashCode())) {
this.plotAreaHasCollision = true;
}
Set<String> worlds = this.config.contains("worlds") ? this.config.getConfigurationSection("worlds").getKeys(false) : new HashSet<String>();
String path = "worlds." + world;
ConfigurationSection worldSection = this.config.getConfigurationSection(path);
int type = worldSection != null ? worldSection.getInt("generator.type") : 0;
if (type == 0) {
if (this.plotareamap.containsKey(world)) {
PS.debug("World possibly already loaded: " + world);
if (this.plotAreaMap.containsKey(world)) {
debug("World possibly already loaded: " + world);
return;
}
IndependentPlotGenerator pg;
@ -1367,10 +1369,10 @@ public class PS {
// Conventional plot generator
PlotArea plotArea = pg.getNewPlotArea(world, null, null, null);
PlotManager plotManager = pg.getNewPlotManager();
log(C.PREFIX + "&aDetected world load for '" + world + "'");
log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + pg);
log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
log(C.PREFIX + "&3 - manager: &7" + plotManager.getClass().getName());
PS.log(C.PREFIX + "&aDetected world load for '" + world + "'");
PS.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + pg);
PS.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
PS.log(C.PREFIX + "&3 - manager: &7" + plotManager.getClass().getName());
if (!this.config.contains(path)) {
this.config.createSection(path);
worldSection = this.config.getConfigurationSection(path);
@ -1392,11 +1394,11 @@ public class PS {
}
ConfigurationSection areasSection = worldSection.getConfigurationSection("areas");
if (areasSection == null) {
if (this.plotareamap.containsKey(world)) {
PS.debug("World possibly already loaded: " + world);
if (this.plotAreaMap.containsKey(world)) {
debug("World possibly already loaded: " + world);
return;
}
log(C.PREFIX + "&aDetected world load for '" + world + "'");
PS.log(C.PREFIX + "&aDetected world load for '" + world + "'");
String gen_string = worldSection.getString("generator.plugin", "PlotSquared");
if (type == 2) {
Set<PlotCluster> clusters = this.clusters_tmp != null ? this.clusters_tmp.get(world) : new HashSet<PlotCluster>();
@ -1412,7 +1414,7 @@ public class PS {
worldSection.createSection("areas." + fullId);
DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
PS.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
if (areaGen == null) {
throw new IllegalArgumentException("Invalid Generator: " + gen_string);
@ -1425,10 +1427,10 @@ public class PS {
} catch (IOException e) {
e.printStackTrace();
}
log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
log(C.PREFIX + "&c | &9plotworld: &7" + pa);
log(C.PREFIX + "&c | &9manager: &7" + pa);
log(C.PREFIX + "&cNote: &7Area created for cluster:" + name + " (invalid or old configuration?)");
PS.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
PS.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
PS.log(C.PREFIX + "&c | &9manager: &7" + pa);
PS.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name + " (invalid or old configuration?)");
areaGen.getPlotGenerator().initialize(pa);
areaGen.augment(pa);
toLoad.add(pa);
@ -1450,9 +1452,9 @@ public class PS {
} catch (IOException e) {
e.printStackTrace();
}
log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
log(C.PREFIX + "&3 - plotworld: &7" + pa);
log(C.PREFIX + "&3 - manager: &7" + pa.getPlotManager());
PS.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
PS.log(C.PREFIX + "&3 - plotworld: &7" + pa);
PS.log(C.PREFIX + "&3 - manager: &7" + pa.getPlotManager());
areaGen.getPlotGenerator().initialize(pa);
areaGen.augment(pa);
addPlotArea(pa);
@ -1462,7 +1464,7 @@ public class PS {
throw new IllegalArgumentException("Invalid type for multi-area world. Expected `2`, got `" + type + "`");
}
for (String areaId : areasSection.getKeys(false)) {
log(C.PREFIX + "&3 - " + areaId);
PS.log(C.PREFIX + "&3 - " + areaId);
int i1 = areaId.indexOf("-");
int i2 = areaId.indexOf(";");
if (i1 == -1 || i2 == -1) {
@ -1524,10 +1526,10 @@ public class PS {
} catch (IOException e) {
e.printStackTrace();
}
log(C.PREFIX + "&aDetected area load for '" + world + "'");
log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
log(C.PREFIX + "&c | &9plotworld: &7" + pa);
log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
PS.log(C.PREFIX + "&aDetected area load for '" + world + "'");
PS.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
PS.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
PS.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
areaGen.getPlotGenerator().initialize(pa);
areaGen.augment(pa);
addPlotArea(pa);
@ -1550,7 +1552,7 @@ public class PS {
for (String element : split) {
String[] pair = element.split("=");
if (pair.length != 2) {
log("&cNo value provided for: &7" + element);
PS.log("&cNo value provided for: &7" + element);
return false;
}
String key = pair[0].toLowerCase();
@ -1559,52 +1561,44 @@ public class PS {
try {
switch (key) {
case "s":
case "size": {
case "size":
this.config.set(base + "plot.size", Configuration.INTEGER.parseString(value).shortValue());
break;
}
case "g":
case "gap": {
case "gap":
this.config.set(base + "road.width", Configuration.INTEGER.parseString(value).shortValue());
break;
}
case "h":
case "height": {
case "height":
this.config.set(base + "road.height", Configuration.INTEGER.parseString(value).shortValue());
this.config.set(base + "plot.height", Configuration.INTEGER.parseString(value).shortValue());
this.config.set(base + "wall.height", Configuration.INTEGER.parseString(value).shortValue());
break;
}
case "f":
case "floor": {
case "floor":
this.config.set(base + "plot.floor",
new ArrayList<>(Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(","))));
break;
}
case "m":
case "main": {
case "main":
this.config.set(base + "plot.filling",
new ArrayList<>(Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(","))));
break;
}
case "w":
case "wall": {
case "wall":
this.config.set(base + "wall.filling", Configuration.BLOCK.parseString(value).toString());
break;
}
case "b":
case "border": {
case "border":
this.config.set(base + "wall.block", Configuration.BLOCK.parseString(value).toString());
break;
}
default: {
log("&cKey not found: &7" + element);
default:
PS.log("&cKey not found: &7" + element);
return false;
}
}
} catch (Exception e) {
e.printStackTrace();
log("&cInvalid value: &7" + value + " in arg " + element);
PS.log("&cInvalid value: &7" + value + " in arg " + element);
return false;
}
}
@ -1660,9 +1654,9 @@ public class PS {
} catch (IOException e) {
MainUtil.sendMessage(sender, "Failed to update PlotSquared");
MainUtil.sendMessage(sender, " - Please update manually");
log("============ Stacktrace ============");
PS.log("============ Stacktrace ============");
e.printStackTrace();
log("====================================");
PS.log("====================================");
}
return false;
}
@ -1716,7 +1710,7 @@ public class PS {
}
} catch (IOException e) {
e.printStackTrace();
log("&cCould not save " + file);
PS.log("&cCould not save " + file);
}
}
@ -1754,7 +1748,7 @@ public class PS {
DBFunc.close();
UUIDHandler.handleShutdown();
} catch (NullPointerException e) {
log("&cCould not close database connection!");
PS.log("&cCould not close database connection!");
}
}
@ -1764,8 +1758,8 @@ public class PS {
public void setupDatabase() {
try {
if (Settings.DB.USE_MONGO) {
log(C.PREFIX + "MongoDB is not yet implemented");
log(C.PREFIX + "&cNo storage type is set!");
PS.log(C.PREFIX + "MongoDB is not yet implemented");
PS.log(C.PREFIX + "&cNo storage type is set!");
this.IMP.disable();
return;
}
@ -1775,7 +1769,7 @@ public class PS {
} else if (Settings.DB.USE_SQLITE) {
this.database = new SQLite(this.IMP.getDirectory() + File.separator + Settings.DB.SQLITE_DB + ".db");
} else {
log(C.PREFIX + "&cNo storage type is set!");
PS.log(C.PREFIX + "&cNo storage type is set!");
this.IMP.disable();
return;
}
@ -1784,18 +1778,18 @@ public class PS {
this.plots_tmp = DBFunc.getPlots();
this.clusters_tmp = DBFunc.getClusters();
} catch (ClassNotFoundException | SQLException e) {
log(C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
PS.log(C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
if (Settings.DB.USE_MONGO) {
log("$4MONGO");
PS.log("$4MONGO");
} else if (Settings.DB.USE_MYSQL) {
log("$4MYSQL");
PS.log("$4MYSQL");
} else if (Settings.DB.USE_SQLITE) {
log("$4SQLITE");
PS.log("$4SQLITE");
}
log("&d==== Here is an ugly stacktrace, if you are interested in those things ===");
PS.log("&d==== Here is an ugly stacktrace, if you are interested in those things ===");
e.printStackTrace();
log("&d==== End of stacktrace ====");
log("&6Please go to the PlotSquared 'storage.yml' and configure the database correctly.");
PS.log("&d==== End of stacktrace ====");
PS.log("&6Please go to the PlotSquared 'storage.yml' and configure the database correctly.");
this.IMP.disable();
}
}
@ -1995,15 +1989,15 @@ public class PS {
if (keep > 0 || ignore > 0) {
options.put("clear.auto.threshold", 1);
options.put("clear.auto.enabled", false);
log("&cIMPORTANT MESSAGE ABOUT THIS UPDATE!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
log("&cSorry for all the exclamation marks, but this could be important.");
log("&cPlot clearing has changed to a new system that requires calibration.");
log("&cThis is how it will work: ");
log("&c - Players will rate plots");
log("&c - When enough plots are rated, you can run /plot debugexec calibrate-analysis");
log("&c - You can decide the (rough) percentage of expired plots to clear");
log("&c - To just clear all expired plot, ignore this and set: &7threshold: -1");
log("&cMore information:&7 https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis:");
PS.log("&cIMPORTANT MESSAGE ABOUT THIS UPDATE!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
PS.log("&cSorry for all the exclamation marks, but this could be important.");
PS.log("&cPlot clearing has changed to a new system that requires calibration.");
PS.log("&cThis is how it will work: ");
PS.log("&c - Players will rate plots");
PS.log("&c - When enough plots are rated, you can run /plot debugexec calibrate-analysis");
PS.log("&c - You can decide the (rough) percentage of expired plots to clear");
PS.log("&c - To just clear all expired plot, ignore this and set: &7threshold: -1");
PS.log("&cMore information:&7 https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis:");
} else {
options.put("clear.auto.threshold", Settings.CLEAR_THRESHOLD);
}
@ -2171,7 +2165,7 @@ public class PS {
Settings.MAX_AUTO_SIZE = this.config.getInt("claim.max-auto-area");
Settings.MAX_PLOTS = this.config.getInt("max_plots");
if (Settings.MAX_PLOTS > 32767) {
log("&c`max_plots` Is set too high! This is a per player setting and does not need to be very large.");
PS.log("&c`max_plots` Is set too high! This is a per player setting and does not need to be very large.");
Settings.MAX_PLOTS = 32767;
}
Settings.GLOBAL_LIMIT = this.config.getBoolean("global_limit");
@ -2179,7 +2173,7 @@ public class PS {
// Misc
Settings.DEBUG = this.config.getBoolean("debug");
if (Settings.DEBUG) {
log(C.PREFIX + "&6Debug Mode Enabled (Default). Edit the config to turn this off.");
PS.log(C.PREFIX + "&6Debug Mode Enabled (Default). Edit the config to turn this off.");
}
Settings.CONSOLE_COLOR = this.config.getBoolean("console.color");
if (!this.config.getBoolean("chat.fancy") || !checkVersion(this.IMP.getServerVersion(), 1, 8, 0)) {
@ -2200,7 +2194,7 @@ public class PS {
public void setupConfigs() {
File folder = new File(this.IMP.getDirectory() + File.separator + "config");
if (!folder.exists() && !folder.mkdirs()) {
log(C.PREFIX + "&cFailed to create the /plugins/config folder. Please create it manually.");
PS.log(C.PREFIX + "&cFailed to create the /plugins/config folder. Please create it manually.");
}
try {
this.styleFile = new File(this.IMP.getDirectory() + File.separator + "translations" + File.separator + "style.yml");
@ -2209,50 +2203,50 @@ public class PS {
this.styleFile.getParentFile().mkdirs();
}
if (!this.styleFile.createNewFile()) {
log("Could not create the style file, please create \"translations/style.yml\" manually");
PS.log("Could not create the style file, please create \"translations/style.yml\" manually");
}
}
this.style = YamlConfiguration.loadConfiguration(this.styleFile);
setupStyle();
} catch (IOException err) {
err.printStackTrace();
log("failed to save style.yml");
PS.log("failed to save style.yml");
}
try {
this.configFile = new File(this.IMP.getDirectory() + File.separator + "config" + File.separator + "settings.yml");
if (!this.configFile.exists()) {
if (!this.configFile.createNewFile()) {
log("Could not create the settings file, please create \"settings.yml\" manually.");
PS.log("Could not create the settings file, please create \"settings.yml\" manually.");
}
}
this.config = YamlConfiguration.loadConfiguration(this.configFile);
setupConfig();
} catch (IOException err_trans) {
log("Failed to save settings.yml");
PS.log("Failed to save settings.yml");
}
try {
this.storageFile = new File(this.IMP.getDirectory() + File.separator + "config" + File.separator + "storage.yml");
if (!this.storageFile.exists()) {
if (!this.storageFile.createNewFile()) {
log("Could not the storage settings file, please create \"storage.yml\" manually.");
PS.log("Could not the storage settings file, please create \"storage.yml\" manually.");
}
}
this.storage = YamlConfiguration.loadConfiguration(this.storageFile);
setupStorage();
} catch (IOException err_trans) {
log("Failed to save storage.yml");
PS.log("Failed to save storage.yml");
}
try {
this.commandsFile = new File(this.IMP.getDirectory() + File.separator + "config" + File.separator + "commands.yml");
if (!this.commandsFile.exists()) {
if (!this.commandsFile.createNewFile()) {
log("Could not the storage settings file, please create \"commands.yml\" manually.");
PS.log("Could not the storage settings file, please create \"commands.yml\" manually.");
}
}
this.commands = YamlConfiguration.loadConfiguration(this.commandsFile);
setupStorage();
} catch (IOException err_trans) {
log("Failed to save commands.yml");
PS.log("Failed to save commands.yml");
}
try {
this.style.save(this.styleFile);
@ -2260,7 +2254,7 @@ public class PS {
this.storage.save(this.storageFile);
this.commands.save(this.commandsFile);
} catch (IOException e) {
log("Configuration file saving failed");
PS.log("Configuration file saving failed");
e.printStackTrace();
}
}
@ -2297,7 +2291,7 @@ public class PS {
}
/**
* Show startup debug information
* Show startup debug information.
*/
private void showDebug() {
if (Settings.DEBUG) {
@ -2312,7 +2306,7 @@ public class PS {
settings.put("Schematics Save Path", "" + Settings.SCHEMATIC_SAVE_PATH);
settings.put("API Location", "" + Settings.API_URL);
for (Entry<String, String> setting : settings.entrySet()) {
log(C.PREFIX + String.format("&cKey: &6%s&c, Value: &6%s", setting.getKey(), setting.getValue()));
PS.log(C.PREFIX + String.format("&cKey: &6%s&c, Value: &6%s", setting.getKey(), setting.getValue()));
}
}
}
@ -2335,7 +2329,7 @@ public class PS {
}
/**
* Get the java version
* Get the java version.
* @return Java version as a double
*/
public double getJavaVersion() {
@ -2378,7 +2372,7 @@ public class PS {
}
public void foreachPlotArea(String world, RunnableVal<PlotArea> runnable) {
PlotArea[] array = this.plotareamap.get(world);
PlotArea[] array = this.plotAreaMap.get(world);
if (array == null) {
return;
}
@ -2404,7 +2398,7 @@ public class PS {
}
public int getPlotAreaCount(String world) {
return this.plotareamap.size();
return this.plotAreaMap.size();
}
public Set<PlotArea> getPlotAreas() {
@ -2419,15 +2413,15 @@ public class PS {
*/
@Deprecated
public Set<String> getPlotWorldStrings() {
HashSet<String> set = new HashSet<>(this.plotareamap.size());
for (Entry<String, PlotArea[]> entry : this.plotareamap.entrySet()) {
HashSet<String> set = new HashSet<>(this.plotAreaMap.size());
for (Entry<String, PlotArea[]> entry : this.plotAreaMap.entrySet()) {
set.add(entry.getKey());
}
return set;
}
public boolean isAugmented(String world) {
PlotArea[] areas = this.plotareamap.get(world);
PlotArea[] areas = this.plotAreaMap.get(world);
if (areas == null) {
return false;
}
@ -2443,7 +2437,7 @@ public class PS {
* @return Collection of PlotArea objects
*/
public Set<PlotArea> getPlotAreas(String world) {
PlotArea[] areas = this.plotareamap.get(world);
PlotArea[] areas = this.plotAreaMap.get(world);
if (areas == null) {
return new HashSet<>(0);
}

79
Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
View File

@ -51,17 +51,16 @@ public class Area extends SubCommand {
switch (args[0].toLowerCase()) {
case "c":
case "setup":
case "create": {
case "create":
if (!Permissions.hasPermission(plr, "plots.area.create")) {
C.NO_PERMISSION.send(plr, "plots.area.create");
return false;
}
switch (args.length) {
case 1: {
case 1:
C.COMMAND_SYNTAX.send(plr, "/plot area create [world[:id]] [<modifier>=<value>]...");
return false;
}
case 2: {
case 2:
switch (args[1].toLowerCase()) {
case "pos1": { // Set position 1
HybridPlotWorld area = plr.getMeta("area_create_area");
@ -69,14 +68,14 @@ public class Area extends SubCommand {
C.COMMAND_SYNTAX.send(plr, "/plot area create [world[:id]] [<modifier>=<value>]...");
return false;
}
Location loc = plr.getLocation();
plr.setMeta("area_pos1", loc);
C.SET_ATTRIBUTE.send(plr, "area_pos1", loc.getX() + "," + loc.getZ());
Location location = plr.getLocation();
plr.setMeta("area_pos1", location);
C.SET_ATTRIBUTE.send(plr, "area_pos1", location.getX() + "," + location.getZ());
MainUtil.sendMessage(plr, "You will now set pos2: /plot area create pos2"
+ "\nNote: The chosen plot size may result in the created area not exactly matching your second position.");
return true;
}
case "pos2": { // Set position 2 and finish creation for type=2 (partial)
case "pos2": // Set position 2 and finish creation for type=2 (partial)
final HybridPlotWorld area = plr.getMeta("area_create_area");
if (area == null) {
C.COMMAND_SYNTAX.send(plr, "/plot area create [world[:id]] [<modifier>=<value>]...");
@ -86,17 +85,17 @@ public class Area extends SubCommand {
Location pos2 = plr.getMeta("area_pos1");
int dx = Math.abs(pos1.getX() - pos2.getX());
int dz = Math.abs(pos1.getZ() - pos2.getZ());
int numx = Math.max(1, (dx + 1 + area.ROAD_WIDTH + area.SIZE / 2) / area.SIZE);
int numz = Math.max(1, (dz + 1 + area.ROAD_WIDTH + area.SIZE / 2) / area.SIZE);
int ddx = dx - (numx * area.SIZE - area.ROAD_WIDTH);
int ddz = dz - (numz * area.SIZE - area.ROAD_WIDTH);
int numX = Math.max(1, (dx + 1 + area.ROAD_WIDTH + area.SIZE / 2) / area.SIZE);
int numZ = Math.max(1, (dz + 1 + area.ROAD_WIDTH + area.SIZE / 2) / area.SIZE);
int ddx = dx - (numX * area.SIZE - area.ROAD_WIDTH);
int ddz = dz - (numZ * area.SIZE - area.ROAD_WIDTH);
int bx = Math.min(pos1.getX(), pos2.getX()) + ddx;
int bz = Math.min(pos1.getZ(), pos2.getZ()) + ddz;
int tx = Math.max(pos1.getX(), pos2.getX()) - ddx;
int tz = Math.max(pos1.getZ(), pos2.getZ()) - ddz;
int lower = (area.ROAD_WIDTH & 1) == 0 ? area.ROAD_WIDTH / 2 - 1 : area.ROAD_WIDTH / 2;
final int offsetx = bx - (area.ROAD_WIDTH == 0 ? 0 : lower);
final int offsetz = bz - (area.ROAD_WIDTH == 0 ? 0 : lower);
final int offsetX = bx - (area.ROAD_WIDTH == 0 ? 0 : lower);
final int offsetZ = bz - (area.ROAD_WIDTH == 0 ? 0 : lower);
final RegionWrapper region = new RegionWrapper(bx, tx, bz, tz);
Set<PlotArea> areas = PS.get().getPlotAreas(area.worldname, region);
if (!areas.isEmpty()) {
@ -109,7 +108,7 @@ public class Area extends SubCommand {
object.terrain = area.TERRAIN;
object.type = area.TYPE;
object.min = new PlotId(1, 1);
object.max = new PlotId(numx, numz);
object.max = new PlotId(numX, numZ);
object.plotManager = "PlotSquared";
object.setupGenerator = "PlotSquared";
object.step = area.getSettingNodes();
@ -117,11 +116,11 @@ public class Area extends SubCommand {
Runnable run = new Runnable() {
@Override
public void run() {
if (offsetx != 0) {
PS.get().config.set(path + ".road.offset.x", offsetx);
if (offsetX != 0) {
PS.get().config.set(path + ".road.offset.x", offsetX);
}
if (offsetz != 0) {
PS.get().config.set(path + ".road.offset.z", offsetz);
if (offsetZ != 0) {
PS.get().config.set(path + ".road.offset.z", offsetZ);
}
final String world = SetupUtils.manager.setupWorld(object);
if (WorldUtil.IMP.isWorld(world)) {
@ -147,9 +146,7 @@ public class Area extends SubCommand {
run.run();
}
return true;
}
}
}
default: // Start creation
final SetupObject object = new SetupObject();
String[] split = args[1].split(":");
@ -180,59 +177,49 @@ public class Area extends SubCommand {
}
switch (pair[0].toLowerCase()) {
case "s":
case "size": {
case "size":
pa.PLOT_WIDTH = Integer.parseInt(pair[1]);
pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
break;
}
case "g":
case "gap": {
case "gap":
pa.ROAD_WIDTH = Integer.parseInt(pair[1]);
pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
break;
}
case "h":
case "height": {
case "height":
int value = Integer.parseInt(pair[1]);
pa.PLOT_HEIGHT = value;
pa.ROAD_HEIGHT = value;
pa.WALL_HEIGHT = value;
break;
}
case "f":
case "floor": {
case "floor":
pa.TOP_BLOCK = Configuration.BLOCKLIST.parseString(pair[1]);
break;
}
case "m":
case "main": {
case "main":
pa.MAIN_BLOCK = Configuration.BLOCKLIST.parseString(pair[1]);
break;
}
case "w":
case "wall": {
case "wall":
pa.WALL_FILLING = Configuration.BLOCK.parseString(pair[1]);
break;
}
case "b":
case "border": {
case "border":
pa.WALL_BLOCK = Configuration.BLOCK.parseString(pair[1]);
break;
}
case "terrain": {
case "terrain":
pa.TERRAIN = Integer.parseInt(pair[1]);
object.terrain = pa.TERRAIN;
break;
}
case "type": {
case "type":
pa.TYPE = Integer.parseInt(pair[1]);
object.type = pa.TYPE;
break;
}
default: {
default:
C.COMMAND_SYNTAX.send(plr, "/plot area create [world[:id]] [<modifier>=<value>]...");
return false;
}
}
}
if (pa.TYPE != 2) {
@ -292,7 +279,6 @@ public class Area extends SubCommand {
break;
}
return true;
}
case "i":
case "info": {
if (!Permissions.hasPermission(plr, "plots.area.info")) {
@ -349,7 +335,7 @@ public class Area extends SubCommand {
return true;
}
case "l":
case "list": {
case "list":
if (!Permissions.hasPermission(plr, "plots.area.list")) {
C.NO_PERMISSION.send(plr, "plots.area.list");
return false;
@ -407,7 +393,6 @@ public class Area extends SubCommand {
}
}, "/plot area list", C.AREA_LIST_HEADER_PAGED.s());
return true;
}
case "regen":
case "regenerate": {
if (!Permissions.hasPermission(plr, "plots.area.regen")) {
@ -435,7 +420,7 @@ public class Area extends SubCommand {
case "v":
case "teleport":
case "visit":
case "tp": {
case "tp":
if (!Permissions.hasPermission(plr, "plots.area.tp")) {
C.NO_PERMISSION.send(plr, "plots.area.tp");
return false;
@ -460,16 +445,14 @@ public class Area extends SubCommand {
}
plr.teleport(center);
return true;
}
case "delete":
case "remove": {
case "remove":
MainUtil.sendMessage(plr, "$1World creation settings may be stored in multiple locations:"
+ "\n$3 - $2Bukkit bukkit.yml"
+ "\n$3 - $2PlotSquared settings.yml"
+ "\n$3 - $2Multiverse worlds.yml (or any world management plugin)"
+ "\n$1Stop the server and delete it from these locations.");
return true;
}
}
C.COMMAND_SYNTAX.send(plr, getUsage());
return false;

11
Core/src/main/java/com/intellectualcrafters/plot/commands/BO3.java
View File

@ -26,7 +26,7 @@ public class BO3 extends SubCommand {
public boolean onCommand(PlotPlayer plr, String[] args) {
Location loc = plr.getLocation();
Plot plot = loc.getPlotAbs();
if ((plot == null) || !plot.hasOwner()) {
if (plot == null || !plot.hasOwner()) {
return !sendMessage(plr, C.NOT_IN_PLOT);
}
if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.bo3")) {
@ -40,21 +40,18 @@ public class BO3 extends SubCommand {
switch (args[0].toLowerCase()) {
case "output":
case "save":
case "export": {
case "export":
return BO3Handler.saveBO3(plr, plot);
}
case "paste":
case "load":
case "import":
case "input": {
case "input":
// TODO NOT IMPLEMENTED YET
MainUtil.sendMessage(plr, "NOT IMPLEMENTED YET!!!");
return false;
}
default: {
default:
noArgs(plr);
return false;
}
}
}
}

12
Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
View File

@ -15,6 +15,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.plotsquared.general.commands.CommandDeclaration;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
@ -237,9 +238,9 @@ public class Cluster extends SubCommand {
return false;
}
HashSet<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
HashSet<Plot> newplots = area.getPlotSelectionOwned(pos1, pos2);
HashSet<Plot> newPlots = area.getPlotSelectionOwned(pos1, pos2);
HashSet<Plot> removed = (HashSet<Plot>) existing.clone();
removed.removeAll(newplots);
removed.removeAll(newPlots);
// Check expand / shrink
if (!removed.isEmpty()) {
if (!Permissions.hasPermission(plr, "plots.cluster.resize.shrink")) {
@ -247,8 +248,8 @@ public class Cluster extends SubCommand {
return false;
}
}
newplots.removeAll(existing);
if (!newplots.isEmpty()) {
newPlots.removeAll(existing);
if (!newPlots.isEmpty()) {
if (!Permissions.hasPermission(plr, "plots.cluster.resize.expand")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize.expand");
return false;
@ -544,7 +545,7 @@ public class Cluster extends SubCommand {
}
case "sh":
case "setspawn":
case "sethome": {
case "sethome":
if (!Permissions.hasPermission(plr, "plots.cluster.sethome")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.sethome");
return false;
@ -574,7 +575,6 @@ public class Cluster extends SubCommand {
cluster.settings.setPosition(blockloc);
DBFunc.setPosition(cluster, relative.getX() + "," + relative.getY() + "," + relative.getZ());
return MainUtil.sendMessage(plr, C.POSITION_SET);
}
}
MainUtil.sendMessage(plr, C.CLUSTER_AVAILABLE_ARGS);
return false;

11
Core/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java
View File

@ -3,19 +3,15 @@ package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.Permissions;
/**
* Created by Citymonstret on 2014-08-03.
*
*/
public class CommandPermission {
/**
* Permission Node
* Permission Node.
*/
public final String permission;
/**
* Command Permission
* @param permission Command Permission
*/
public CommandPermission(String permission) {
@ -23,7 +19,8 @@ public class CommandPermission {
}
/**
* @param player Does the player have the permission?
* Check the permissions of a player.
* @param player The player to check permissions for
*
* @return true of player has the required permission node
*/

39
Core/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
View File

@ -10,6 +10,7 @@ import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.WorldUtil;
import com.plotsquared.general.commands.CommandDeclaration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@ -29,7 +30,7 @@ public class Condense extends SubCommand {
@Override
public boolean onCommand(final PlotPlayer plr, String[] args) {
if ((args.length != 2) && (args.length != 3)) {
if (args.length != 2 && args.length != 3) {
MainUtil.sendMessage(plr, "/plot condense <area> <start|stop|info> [radius]");
return false;
}
@ -44,7 +45,7 @@ public class Condense extends SubCommand {
MainUtil.sendMessage(plr, "/plot condense " + area.toString() + " start <radius>");
return false;
}
if (TASK) {
if (Condense.TASK) {
MainUtil.sendMessage(plr, "TASK ALREADY STARTED");
return false;
}
@ -55,13 +56,13 @@ public class Condense extends SubCommand {
int radius = Integer.parseInt(args[2]);
ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlots(area));
// remove non base plots
Iterator<Plot> iter = plots.iterator();
Iterator<Plot> iterator = plots.iterator();
int maxSize = 0;
ArrayList<Integer> sizes = new ArrayList<>();
while (iter.hasNext()) {
Plot plot = iter.next();
while (iterator.hasNext()) {
Plot plot = iterator.next();
if (!plot.isBasePlot()) {
iter.remove();
iterator.remove();
continue;
}
int size = plot.getConnectedPlots().size();
@ -90,7 +91,7 @@ public class Condense extends SubCommand {
}
}
int size = allPlots.size();
int minimumRadius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
int minimumRadius = (int) Math.ceil(Math.sqrt(size) / 2 + 1);
if (radius < minimumRadius) {
MainUtil.sendMessage(plr, "RADIUS TOO SMALL");
return false;
@ -98,7 +99,7 @@ public class Condense extends SubCommand {
List<PlotId> toMove = new ArrayList<>(getPlots(allPlots, radius));
final List<PlotId> free = new ArrayList<>();
PlotId start = new PlotId(0, 0);
while ((start.x <= minimumRadius) && (start.y <= minimumRadius)) {
while (start.x <= minimumRadius && start.y <= minimumRadius) {
Plot plot = area.getPlotAbs(start);
if (plot != null && !plot.hasOwner()) {
free.add(plot.getId());
@ -113,11 +114,11 @@ public class Condense extends SubCommand {
Runnable run = new Runnable() {
@Override
public void run() {
if (!TASK) {
if (!Condense.TASK) {
MainUtil.sendMessage(plr, "TASK CANCELLED.");
}
if (allPlots.isEmpty()) {
TASK = false;
Condense.TASK = false;
MainUtil.sendMessage(plr, "TASK COMPLETE. PLEASE VERIFY THAT NO NEW PLOTS HAVE BEEN CLAIMED DURING TASK.");
return;
}
@ -146,7 +147,7 @@ public class Condense extends SubCommand {
}
}
if (free.isEmpty()) {
TASK = false;
Condense.TASK = false;
MainUtil.sendMessage(plr, "TASK FAILED. NO FREE PLOTS FOUND!");
return;
}
@ -155,20 +156,19 @@ public class Condense extends SubCommand {
}
}
};
TASK = true;
Condense.TASK = true;
TaskManager.runTaskAsync(run);
return true;
}
case "stop": {
if (!TASK) {
case "stop":
if (!Condense.TASK) {
MainUtil.sendMessage(plr, "TASK ALREADY STOPPED");
return false;
}
TASK = false;
Condense.TASK = false;
MainUtil.sendMessage(plr, "TASK STOPPED");
return true;
}
case "info": {
case "info":
if (args.length == 2) {
MainUtil.sendMessage(plr, "/plot condense " + area.toString() + " info <radius>");
return false;
@ -180,7 +180,7 @@ public class Condense extends SubCommand {
int radius = Integer.parseInt(args[2]);
Collection<Plot> plots = area.getPlots();
int size = plots.size();
int minimumRadius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
int minimumRadius = (int) Math.ceil(Math.sqrt(size) / 2 + 1);
if (radius < minimumRadius) {
MainUtil.sendMessage(plr, "RADIUS TOO SMALL");
return false;
@ -196,7 +196,6 @@ public class Condense extends SubCommand {
MainUtil.sendMessage(plr, "ESTIMATED TIME: " + "No idea, times will drastically change based on the system performance and load");
MainUtil.sendMessage(plr, "&e - Radius is measured in plot width");
return true;
}
}
MainUtil.sendMessage(plr, "/plot condense " + area.worldname + " <start|stop|info> [radius]");
return false;
@ -205,7 +204,7 @@ public class Condense extends SubCommand {
public Set<PlotId> getPlots(Collection<Plot> plots, int radius) {
HashSet<PlotId> outside = new HashSet<>();
for (Plot plot : plots) {
if ((plot.getId().x > radius) || (plot.getId().x < -radius) || (plot.getId().y > radius) || (plot.getId().y < -radius)) {
if (plot.getId().x > radius || plot.getId().x < -radius || plot.getId().y > radius || plot.getId().y < -radius) {
outside.add(plot.getId());
}
}

7
Core/src/main/java/com/intellectualcrafters/plot/commands/Database.java
View File

@ -78,7 +78,7 @@ public class Database extends SubCommand {
com.intellectualcrafters.plot.database.Database implementation;
String prefix = "";
switch (args[0].toLowerCase()) {
case "import": {
case "import":
if (args.length < 2) {
MainUtil.sendMessage(player, "/plot database import [sqlite file] [prefix]");
return false;
@ -90,7 +90,7 @@ public class Database extends SubCommand {
}
MainUtil.sendMessage(player, "&6Starting...");
implementation = new SQLite(file.getPath());
SQLManager manager = new SQLManager(implementation, (args.length == 3) ? args[2] : "", true);
SQLManager manager = new SQLManager(implementation, args.length == 3 ? args[2] : "", true);
HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
plots = new ArrayList<>();
for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
@ -122,7 +122,6 @@ public class Database extends SubCommand {
}
});
return true;
}
case "mysql":
if (args.length < 6) {
return MainUtil.sendMessage(player, "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
@ -148,7 +147,7 @@ public class Database extends SubCommand {
}
try {
SQLManager manager = new SQLManager(implementation, prefix, true);
insertPlots(manager, plots, player);
Database.insertPlots(manager, plots, player);
return true;
} catch (ClassNotFoundException | SQLException e) {
MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");

2
Core/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
View File

@ -95,7 +95,7 @@ public class DebugClaimTest extends SubCommand {
plot.owner = uuid;
plots.add(plot);
} else {
MainUtil.sendMessage(plr, " - &cInvalid playername: " + plot.getId() + " : " + line);
MainUtil.sendMessage(plr, " - &cInvalid PlayerName: " + plot.getId() + " : " + line);
}
}
}

100
Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java
View File

@ -3,6 +3,7 @@ package com.intellectualcrafters.plot.commands;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.util.StringMan;
import com.plotsquared.general.commands.Command;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@ -18,22 +19,24 @@ public class GenerateDocs {
public static void main(String[] args) {
new WE_Anywhere();
List<Command> commands = MainCommand.getInstance().getCommands();
log("### Want to document some commands?");
log(" - This page is automatically generated");
log(" - Fork the project and add a javadoc comment to one of the command classes");
log(" - Then do a pull request and it will be added to this page");
log("");
log("# Contents");
GenerateDocs.log("### Want to document some commands?");
GenerateDocs.log(" - This page is automatically generated");
GenerateDocs.log(" - Fork the project and add a javadoc comment to one of the command classes");
GenerateDocs.log(" - Then do a pull request and it will be added to this page");
GenerateDocs.log("");
GenerateDocs.log("# Contents");
for (CommandCategory category : CommandCategory.values()) {
log("###### " + category.name());
GenerateDocs.log("###### " + category.name());
for (Command command : MainCommand.getInstance().getCommands(category, null)) {
log(" - [/plot " + command.getId() + "](https://github.com/IntellectualSites/PlotSquared/wiki/Commands#" + command.getId() + ") ");
GenerateDocs
.log(" - [/plot " + command.getId() + "](https://github.com/IntellectualSites/PlotSquared/wiki/Commands#" + command.getId()
+ ") ");
}
log("");
GenerateDocs.log("");
}
log("# Commands");
GenerateDocs.log("# Commands");
for (Command command : commands) {
printCommand(command);
GenerateDocs.printCommand(command);
}
}
@ -46,62 +49,60 @@ public class GenerateDocs {
String source =
"https://github.com/IntellectualSites/PlotSquared/tree/master/Core/src/main/java/com/intellectualcrafters/plot/commands/" + clazz
+ ".java";
log("## [" + name.toUpperCase() + "](" + source + ") ");
GenerateDocs.log("## [" + name.toUpperCase() + "](" + source + ") ");
File file = new File("Core/src/main/java/com/intellectualcrafters/plot/commands/" + clazz + ".java");
List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
List<String> perms = getPerms(name, lines);
List<String> usages = getUsage(name, lines);
String comment = getComments(lines);
List<String> perms = GenerateDocs.getPerms(name, lines);
List<String> usages = GenerateDocs.getUsage(name, lines);
String comment = GenerateDocs.getComments(lines);
log("#### Description");
log("`" + command.getDescription() + "`");
GenerateDocs.log("#### Description");
GenerateDocs.log("`" + command.getDescription() + "`");
if (!comment.isEmpty()) {
log("##### Comments");
log("``` java");
log(comment);
log("```");
GenerateDocs.log("##### Comments");
GenerateDocs.log("``` java");
GenerateDocs.log(comment);
GenerateDocs.log("```");
}
log("#### Usage ");
{
String mainUsage = command.getUsage().replaceAll("\\{label\\}", "plot");
if (!usages.isEmpty() && !usages.get(0).equalsIgnoreCase(mainUsage)) {
log("##### Primary ");
log(" - `" + mainUsage + "` ");
log("");
log("##### Other ");
log(" - `" + StringMan.join(usages, "`\n - `") + "` ");
log("");
} else {
log("`" + mainUsage + "` ");
}
GenerateDocs.log("#### Usage ");
String mainUsage = command.getUsage().replaceAll("\\{label\\}", "plot");
if (!usages.isEmpty() && !usages.get(0).equalsIgnoreCase(mainUsage)) {
GenerateDocs.log("##### Primary ");
GenerateDocs.log(" - `" + mainUsage + "` ");
GenerateDocs.log("");
GenerateDocs.log("##### Other ");
GenerateDocs.log(" - `" + StringMan.join(usages, "`\n - `") + "` ");
GenerateDocs.log("");
} else {
GenerateDocs.log("`" + mainUsage + "` ");
}
if (command.getRequiredType() != RequiredType.NONE) {
log("#### Required callers");
log("`" + command.getRequiredType().name() + "`");
GenerateDocs.log("#### Required callers");
GenerateDocs.log("`" + command.getRequiredType().name() + "`");
}
List<String> aliases = command.getAliases();
if (!aliases.isEmpty()) {
log("#### Aliases");
log("`" + StringMan.getString(command.getAliases()) + "`");
GenerateDocs.log("#### Aliases");
GenerateDocs.log("`" + StringMan.getString(command.getAliases()) + "`");
}
log("#### Permissions");
GenerateDocs.log("#### Permissions");
if (!perms.isEmpty()) {
log("##### Primary");
log(" - `" + command.getPermission() + "` ");
log("");
log("##### Other");
log(" - `" + StringMan.join(perms, "`\n - `") + "`");
log("");
GenerateDocs.log("##### Primary");
GenerateDocs.log(" - `" + command.getPermission() + "` ");
GenerateDocs.log("");
GenerateDocs.log("##### Other");
GenerateDocs.log(" - `" + StringMan.join(perms, "`\n - `") + "`");
GenerateDocs.log("");
} else {
log("`" + command.getPermission() + "` ");
GenerateDocs.log("`" + command.getPermission() + "` ");
}
log("***");
log("");
GenerateDocs.log("***");
GenerateDocs.log("");
} catch (Exception e) {
e.printStackTrace();
}
@ -189,10 +190,9 @@ public class GenerateDocs {
}
switch (cmd.toLowerCase()) {
case "auto":
case "claim": {
case "claim":
perms.add("plots.plot.<#>");
break;
}
}
return new ArrayList<>(perms);
}

12
Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java
View File

@ -30,11 +30,10 @@ public class Help extends Command {
@Override
public void execute(PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, RunnableVal2<Command, CommandResult> whenDone) {
switch (args.length) {
case 0: {
case 0:
displayHelp(player, null, 0);
return;
}
case 1: {
case 1:
if (MathMan.isInteger(args[0])) {
try {
displayHelp(player, null, Integer.parseInt(args[0]));
@ -45,8 +44,7 @@ public class Help extends Command {
displayHelp(player, args[0], 1);
}
return;
}
case 2: {
case 2:
if (MathMan.isInteger(args[1])) {
try {
displayHelp(player, args[1], Integer.parseInt(args[1]));
@ -55,10 +53,8 @@ public class Help extends Command {
}
}
return;
}
default: {
default:
C.COMMAND_SYNTAX.send(player, getUsage());
}
}
}

14
Core/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
View File

@ -10,6 +10,7 @@ import com.intellectualcrafters.plot.util.CommentManager;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.StringMan;
import com.plotsquared.general.commands.CommandDeclaration;
import java.util.ArrayList;
import java.util.List;
@ -23,7 +24,7 @@ import java.util.List;
public class Inbox extends SubCommand {
public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
if ((oldComments == null) || oldComments.isEmpty()) {
if (oldComments == null || oldComments.isEmpty()) {
MainUtil.sendMessage(player, C.INBOX_EMPTY);
return;
}
@ -38,7 +39,7 @@ public class Inbox extends SubCommand {
page = totalPages;
}
// Only display 12 per page
int max = (page * 12) + 12;
int max = page * 12 + 12;
if (max > comments.length) {
max = comments.length;
}
@ -112,7 +113,7 @@ public class Inbox extends SubCommand {
final int page;
if (args.length > 1) {
switch (args[1].toLowerCase()) {
case "delete": {
case "delete":
if (!inbox.canModify(plot, player)) {
sendMessage(player, C.NO_PERM_INBOX_MODIFY);
return false;
@ -149,8 +150,7 @@ public class Inbox extends SubCommand {
return false;
}
return true;
}
case "clear": {
case "clear":
if (!inbox.canModify(plot, player)) {
sendMessage(player, C.NO_PERM_INBOX_MODIFY);
}
@ -161,15 +161,13 @@ public class Inbox extends SubCommand {
}
MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
return true;
}
default: {
default:
try {
page = Integer.parseInt(args[1]);
} catch (NumberFormatException e) {
sendMessage(player, C.COMMAND_SYNTAX, "/plot inbox [inbox] [delete <index>|clear|page]");
return false;
}
}
}
} else {
page = 1;

10
Core/src/main/java/com/intellectualcrafters/plot/commands/Info.java
View File

@ -66,7 +66,7 @@ public class Info extends SubCommand {
args = new String[]{args[1]};
}
}
if ((args.length == 1) && args[0].equalsIgnoreCase("inv")) {
if (args.length == 1 && args[0].equalsIgnoreCase("inv")) {
PlotInventory inv = new PlotInventory(player) {
@Override
public boolean onClick(int index) {
@ -95,13 +95,9 @@ public class Info extends SubCommand {
return true;
}
boolean hasOwner = plot.hasOwner();
boolean containsEveryone;
boolean trustedEveryone;
// Wildcard player {added}
{
containsEveryone = plot.getTrusted().contains(DBFunc.everyone);
trustedEveryone = plot.getMembers().contains(DBFunc.everyone);
}
boolean containsEveryone = plot.getTrusted().contains(DBFunc.everyone);
boolean trustedEveryone = plot.getMembers().contains(DBFunc.everyone);
// Unclaimed?
if (!hasOwner && !containsEveryone && !trustedEveryone) {
MainUtil.sendMessage(player, C.PLOT_INFO_UNCLAIMED, plot.getId().x + ";" + plot.getId().y);

58
Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java
View File

@ -26,6 +26,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import java.util.UUID;
@ -39,8 +40,8 @@ import java.util.UUID;
public class ListCmd extends SubCommand {
private String[] getArgumentList(PlotPlayer player) {
java.util.List<String> args = new ArrayList<>();
if ((EconHandler.manager != null) && Permissions.hasPermission(player, "plots.list.forsale")) {
List<String> args = new ArrayList<>();
if (EconHandler.manager != null && Permissions.hasPermission(player, "plots.list.forsale")) {
args.add("forsale");
}
if (Permissions.hasPermission(player, "plots.list.mine")) {
@ -105,14 +106,14 @@ public class ListCmd extends SubCommand {
}
}
java.util.List<Plot> plots = null;
List<Plot> plots = null;
String world = plr.getLocation().getWorld();
PlotArea area = plr.getApplicablePlotArea();
String arg = args[0].toLowerCase();
boolean sort = true;
switch (arg) {
case "mine": {
case "mine":
if (!Permissions.hasPermission(plr, "plots.list.mine")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.mine");
return false;
@ -120,8 +121,7 @@ public class ListCmd extends SubCommand {
sort = false;
plots = PS.get().sortPlotsByTemp(PS.get().getBasePlots(plr));
break;
}
case "shared": {
case "shared":
if (!Permissions.hasPermission(plr, "plots.list.shared")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.shared");
return false;
@ -133,8 +133,7 @@ public class ListCmd extends SubCommand {
}
}
break;
}
case "world": {
case "world":
if (!Permissions.hasPermission(plr, "plots.list.world")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world");
return false;
@ -145,16 +144,14 @@ public class ListCmd extends SubCommand {
}
plots = new ArrayList<>(PS.get().getPlots(world));
break;
}
case "expired": {
case "expired":
if (!Permissions.hasPermission(plr, "plots.list.expired")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.expired");
return false;
}
plots = ExpireManager.IMP == null ? new ArrayList<Plot>() : new ArrayList<>(ExpireManager.IMP.getPendingExpired());
break;
}
case "area": {
case "area":
if (!Permissions.hasPermission(plr, "plots.list.area")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.area");
return false;
@ -165,16 +162,14 @@ public class ListCmd extends SubCommand {
}
plots = area == null ? new ArrayList<Plot>() : new ArrayList<>(area.getPlots());
break;
}
case "all": {
case "all":
if (!Permissions.hasPermission(plr, "plots.list.all")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.all");
return false;
}
plots = new ArrayList<>(PS.get().getPlots());
break;
}
case "done": {
case "done":
if (!Permissions.hasPermission(plr, "plots.list.done")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.done");
return false;
@ -203,8 +198,7 @@ public class ListCmd extends SubCommand {
});
sort = false;
break;
}
case "top": {
case "top":
if (!Permissions.hasPermission(plr, "plots.list.top")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.top");
return false;
@ -233,7 +227,7 @@ public class ListCmd extends SubCommand {
v2 /= p2s;
v2 += p2s;
}
if ((v2 == v1) && (v2 != 0)) {
if (v2 == v1 && v2 != 0) {
return p2s - p1s;
}
return (int) Math.signum(v2 - v1);
@ -241,8 +235,7 @@ public class ListCmd extends SubCommand {
});
sort = false;
break;
}
case "forsale": {
case "forsale":
if (!Permissions.hasPermission(plr, "plots.list.forsale")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.forsale");
return false;
@ -258,8 +251,7 @@ public class ListCmd extends SubCommand {
}
}
break;
}
case "unowned": {
case "unowned":
if (!Permissions.hasPermission(plr, "plots.list.unowned")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.unowned");
return false;
@ -271,8 +263,7 @@ public class ListCmd extends SubCommand {
}
}
break;
}
case "unknown": {
case "unknown":
if (!Permissions.hasPermission(plr, "plots.list.unknown")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.unknown");
return false;
@ -287,8 +278,7 @@ public class ListCmd extends SubCommand {
}
}
break;
}
case "fuzzy": {
case "fuzzy":
if (!Permissions.hasPermission(plr, "plots.list.fuzzy")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.fuzzy");
return false;
@ -301,8 +291,7 @@ public class ListCmd extends SubCommand {
plots = MainUtil.getPlotsBySearch(term);
sort = false;
break;
}
default: {
default:
if (PS.get().hasPlotArea(args[0])) {
if (!Permissions.hasPermission(plr, "plots.list.world")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world");
@ -331,7 +320,6 @@ public class ListCmd extends SubCommand {
plots = PS.get().sortPlotsByTemp(PS.get().getPlots(uuid));
break;
}
}
}
if (plots == null) {
@ -347,13 +335,13 @@ public class ListCmd extends SubCommand {
return true;
}
public void displayPlots(final PlotPlayer player, java.util.List<Plot> plots, int pageSize, int page, PlotArea area,
public void displayPlots(final PlotPlayer player, List<Plot> plots, int pageSize, int page, PlotArea area,
String[] args, boolean sort) {
// Header
Iterator<Plot> iter = plots.iterator();
while (iter.hasNext()) {
if (!iter.next().isBasePlot()) {
iter.remove();
Iterator<Plot> iterator = plots.iterator();
while (iterator.hasNext()) {
if (!iterator.next().isBasePlot()) {
iterator.remove();
}
}
if (sort) {

10
Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java
View File

@ -65,9 +65,9 @@ public class Load extends SubCommand {
MainUtil.sendMessage(plr, C.LOAD_NULL);
return false;
}
String schem;
String schematic;
try {
schem = schematics.get(Integer.parseInt(args[0]) - 1);
schematic = schematics.get(Integer.parseInt(args[0]) - 1);
} catch (NumberFormatException e) {
// use /plot load <index>
MainUtil.sendMessage(plr, C.NOT_VALID_NUMBER, "(1, " + schematics.size() + ")");
@ -75,7 +75,7 @@ public class Load extends SubCommand {
}
final URL url;
try {
url = new URL(Settings.WEB_URL + "saves/" + plr.getUUID() + "/" + schem + ".schematic");
url = new URL(Settings.WEB_URL + "saves/" + plr.getUUID() + "/" + schematic + ".schematic");
} catch (MalformedURLException e) {
e.printStackTrace();
MainUtil.sendMessage(plr, C.LOAD_FAILED);
@ -140,8 +140,8 @@ public class Load extends SubCommand {
List<String> schematics = player.getMeta("plot_schematics");
for (int i = 0; i < Math.min(schematics.size(), 32); i++) {
try {
String schem = schematics.get(i);
String[] split = schem.split("_");
String schematic = schematics.get(i);
String[] split = schematic.split("_");
if (split.length != 6) {
continue;
}

22
Core/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
View File

@ -47,52 +47,46 @@ public class Purge extends SubCommand {
}
switch (split[0].toLowerCase()) {
case "world":
case "w": {
case "w":
world = split[1];
break;
}
case "area":
case "a": {
case "a":
area = PS.get().getPlotAreaByString(split[1]);
if (area == null) {
C.NOT_VALID_PLOT_WORLD.send(plr, split[1]);
return false;
}
break;
}
case "plotid":
case "id": {
case "id":
id = PlotId.fromString(split[1]);
if (id == null) {
C.NOT_VALID_PLOT_ID.send(plr, split[1]);
return false;
}
break;
}
case "owner":
case "o": {
case "o":
owner = UUIDHandler.getUUID(split[1], null);
if (owner == null) {
C.INVALID_PLAYER.send(plr, split[1]);
return false;
}
break;
}
case "shared":
case "s": {
case "s":
added = UUIDHandler.getUUID(split[1], null);
if (added == null) {
C.INVALID_PLAYER.send(plr, split[1]);
return false;
}
break;
}
case "unknown":
case "?":
case "u": {
case "u":
unknown = Boolean.parseBoolean(split[1]);
break;
}
}
}
final HashSet<Plot> toDelete = new HashSet<>();
@ -121,8 +115,8 @@ public class Purge extends SubCommand {
}
if (PS.get().plots_tmp != null) {
for (Entry<String, HashMap<PlotId, Plot>> entry : PS.get().plots_tmp.entrySet()) {
String worldname = entry.getKey();
if (world != null && !world.equalsIgnoreCase(worldname)) {
String worldName = entry.getKey();
if (world != null && !world.equalsIgnoreCase(worldName)) {
continue;
}
for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {

5
Core/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
View File

@ -16,6 +16,7 @@ import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.TaskManager;
import com.plotsquared.general.commands.Command;
import com.plotsquared.general.commands.CommandDeclaration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@ -87,7 +88,7 @@ public class Rate extends SubCommand {
sendMessage(player, C.RATING_NOT_DONE);
return false;
}
if ((Settings.RATING_CATEGORIES != null) && !Settings.RATING_CATEGORIES.isEmpty()) {
if (Settings.RATING_CATEGORIES != null && !Settings.RATING_CATEGORIES.isEmpty()) {
final Runnable run = new Runnable() {
@Override
public void run() {
@ -154,7 +155,7 @@ public class Rate extends SubCommand {
}
String arg = args[0];
final int rating;
if (MathMan.isInteger(arg) && (arg.length() < 3) && !arg.isEmpty()) {
if (MathMan.isInteger(arg) && arg.length() < 3 && !arg.isEmpty()) {
rating = Integer.parseInt(arg);
if (rating > 10 || rating < 1) {
sendMessage(player, C.RATING_NOT_VALID);

4
Core/src/main/java/com/intellectualcrafters/plot/commands/Remove.java
View File

@ -9,6 +9,7 @@ import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.plotsquared.general.commands.Argument;
import com.plotsquared.general.commands.CommandDeclaration;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.UUID;
@ -63,7 +64,7 @@ public class Remove extends SubCommand {
}
break;
}
case "*": {
case "*":
ArrayList<UUID> toRemove = new ArrayList<>();
HashSet<UUID> all = new HashSet<>();
all.addAll(plot.getMembers());
@ -79,7 +80,6 @@ public class Remove extends SubCommand {
plot.removeMember(uuid);
}
break;
}
default:
UUID uuid = UUIDHandler.getUUID(args[0], null);
if (uuid != null) {

7
Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
View File

@ -15,6 +15,7 @@ import com.intellectualcrafters.plot.util.SchematicHandler;
import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
import com.intellectualcrafters.plot.util.TaskManager;
import com.plotsquared.general.commands.CommandDeclaration;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@ -174,7 +175,7 @@ public class SchematicCmd extends SubCommand {
break;
}
case "export":
case "save": {
case "save":
if (!Permissions.hasPermission(plr, "plots.schematic.save")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save");
return false;
@ -214,11 +215,9 @@ public class SchematicCmd extends SubCommand {
MainUtil.sendMessage(plr, "&7Starting export...");
}
break;
}
default: {
default:
sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
break;
}
}
return true;
}

29
Core/src/main/java/com/intellectualcrafters/plot/commands/Set.java
View File

@ -17,6 +17,7 @@ import com.intellectualcrafters.plot.util.StringMan;
import com.intellectualcrafters.plot.util.WorldUtil;
import com.plotsquared.general.commands.Command;
import com.plotsquared.general.commands.CommandDeclaration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@ -159,23 +160,21 @@ public class Set extends SubCommand {
return this.component.onCommand(plr, Arrays.copyOfRange(args, 0, args.length));
}
// flag
{
AbstractFlag af;
try {
af = new AbstractFlag(args[0].toLowerCase());
} catch (Exception e) {
af = new AbstractFlag("");
}
if (FlagManager.getFlags().contains(af)) {
StringBuilder a = new StringBuilder();
if (args.length > 1) {
for (int x = 1; x < args.length; x++) {
a.append(" ").append(args[x]);
}
AbstractFlag af;
try {
af = new AbstractFlag(args[0].toLowerCase());
} catch (Exception e) {
af = new AbstractFlag("");
}
if (FlagManager.getFlags().contains(af)) {
StringBuilder a = new StringBuilder();
if (args.length > 1) {
for (int x = 1; x < args.length; x++) {
a.append(" ").append(args[x]);
}
MainCommand.onCommand(plr, ("flag set " + args[0] + a.toString()).split(" "));
return true;
}
MainCommand.onCommand(plr, ("flag set " + args[0] + a.toString()).split(" "));
return true;
}
return noArgs(plr);
}

6
Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
View File

@ -28,18 +28,16 @@ public class SetHome extends SetCommand {
base.setHome(null);
return MainUtil.sendMessage(plr, C.POSITION_UNSET);
}
case "": {
case "":
Plot base = plot.getBasePlot(false);
Location bot = base.getBottomAbs();
Location loc = plr.getLocationFull();
BlockLoc rel = new BlockLoc(loc.getX() - bot.getX(), loc.getY(), loc.getZ() - bot.getZ(), loc.getYaw(), loc.getPitch());
base.setHome(rel);
return MainUtil.sendMessage(plr, C.POSITION_SET);
}
default: {
default:
MainUtil.sendMessage(plr, C.HOME_ARGUMENT);
return false;
}
}
}
}

27
Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
View File

@ -75,8 +75,8 @@ public class Setup extends SubCommand {
}
int index = object.current;
switch (index) {
case 0: { // choose generator
if ((args.length != 1) || !SetupUtils.generators.containsKey(args[0])) {
case 0: // choose generator
if (args.length != 1 || !SetupUtils.generators.containsKey(args[0])) {
String prefix = "\n&8 - &7";
MainUtil.sendMessage(plr, "&cYou must choose a generator!" + prefix + StringMan.join(SetupUtils.generators.keySet(), prefix)
.replaceAll("PlotSquared", "&2PlotSquared"));
@ -89,8 +89,7 @@ public class Setup extends SubCommand {
MainUtil.sendMessage(plr, "&6What world type do you want?" + "\n&8 - &2DEFAULT&8 - &7Standard plot generation"
+ "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain" + partial);
break;
}
case 1: { // choose world type
case 1: // choose world type
List<String> allTypes = Arrays.asList("default", "augmented", "partial");
List<String> allDesc = Arrays.asList("Standard plot generation", "Plot generation with vanilla terrain",
"Vanilla with clusters of plots");
@ -100,7 +99,7 @@ public class Setup extends SubCommand {
}
types.add("augmented");
types.add("partial");
if ((args.length != 1) || !types.contains(args[0].toLowerCase())) {
if (args.length != 1 || !types.contains(args[0].toLowerCase())) {
MainUtil.sendMessage(plr, "&cYou must choose a world type!");
for (String type : types) {
int i = allTypes.indexOf(type);
@ -157,8 +156,7 @@ public class Setup extends SubCommand {
}
}
break;
}
case 2: { // area id
case 2: // area id
if (!StringMan.isAlphanumericUnd(args[0])) {
MainUtil.sendMessage(plr, "&cThe area id must be alphanumerical!");
return false;
@ -173,8 +171,7 @@ public class Setup extends SubCommand {
object.current++;
MainUtil.sendMessage(plr, "&6What should be the minimum Plot Id?");
break;
}
case 3: { // min
case 3: // min
object.min = PlotId.fromString(args[0]);
if (object.min == null) {
MainUtil.sendMessage(plr, "&cYou must choose a valid minimum PlotId!");
@ -183,8 +180,7 @@ public class Setup extends SubCommand {
object.current++;
MainUtil.sendMessage(plr, "&6What should be the maximum Plot Id?");
break;
}
case 4: {
case 4:
// max
PlotId id = PlotId.fromString(args[0]);
if (id == null) {
@ -203,10 +199,9 @@ public class Setup extends SubCommand {
+ "\n&8 - &7ROAD&8 - &7Terrain separated by roads"
+ "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
break;
}
case 5: { // Choose terrain
List<String> terrain = Arrays.asList("none", "ore", "road", "all");
if ((args.length != 1) || !terrain.contains(args[0].toLowerCase())) {
if (args.length != 1 || !terrain.contains(args[0].toLowerCase())) {
MainUtil.sendMessage(plr, "&cYou must choose the terrain!"
+ "\n&8 - &2NONE&8 - &7No terrain at all"
+ "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
@ -225,7 +220,7 @@ public class Setup extends SubCommand {
step.getDefaultValue() + "");
break;
}
case 6: { // world setup
case 6: // world setup
if (object.setup_index == object.step.length) {
MainUtil.sendMessage(plr, "&6What do you want your world to be called?");
object.setup_index = 0;
@ -257,8 +252,7 @@ public class Setup extends SubCommand {
step.getDefaultValue() + "");
return false;
}
}
case 7: {
case 7:
if (args.length != 1) {
MainUtil.sendMessage(plr, "&cYou need to choose a world name!");
return false;
@ -287,7 +281,6 @@ public class Setup extends SubCommand {
e.printStackTrace();
}
sendMessage(plr, C.SETUP_FINISHED, object.world);
}
}
return false;
}

8
Core/src/main/java/com/intellectualcrafters/plot/commands/Target.java
View File

@ -20,16 +20,16 @@ public class Target extends SubCommand {
@Override
public boolean onCommand(PlotPlayer plr, String[] args) {
Location ploc = plr.getLocation();
if (!ploc.isPlotArea()) {
Location plrLocation = plr.getLocation();
if (!plrLocation.isPlotArea()) {
MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
return false;
}
Plot target = null;
if (StringMan.isEqualIgnoreCaseToAny(args[0], "near", "nearest")) {
int distance = Integer.MAX_VALUE;
for (Plot plot : PS.get().getPlots(ploc.getWorld())) {
double current = plot.getCenter().getEuclideanDistanceSquared(ploc);
for (Plot plot : PS.get().getPlots(plrLocation.getWorld())) {
double current = plot.getCenter().getEuclideanDistanceSquared(plrLocation);
if (current < distance) {
distance = (int) current;
target = plot;

7
Core/src/main/java/com/intellectualcrafters/plot/commands/Trim.java
View File

@ -14,6 +14,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.WorldUtil;
import com.plotsquared.general.commands.CommandDeclaration;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@ -164,9 +165,9 @@ public class Trim extends SubCommand {
plr.sendMessage("Trim done!");
return;
}
Iterator<ChunkLoc> iter = nonViable.iterator();
ChunkLoc mcr = iter.next();
iter.remove();
Iterator<ChunkLoc> iterator = nonViable.iterator();
ChunkLoc mcr = iterator.next();
iterator.remove();
int cbx = mcr.x << 5;
int cbz = mcr.z << 5;
// get all 1024 chunks

21
Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
View File

@ -9,6 +9,7 @@ import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.plotsquared.general.commands.CommandDeclaration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@ -44,15 +45,14 @@ public class Visit extends SubCommand {
int page = Integer.MIN_VALUE;
Collection<Plot> unsorted = null;
switch (args.length) {
case 2: {
case 2:
if (!MathMan.isInteger(args[1])) {
sendMessage(player, C.NOT_VALID_NUMBER, "(1, ∞)");
sendMessage(player, C.COMMAND_SYNTAX, "/plot visit " + args[0] + " [#]");
return false;
}
page = Integer.parseInt(args[1]);
}
case 1: {
case 1:
UUID user = UUIDHandler.getCachedUUID(args[0], null);
if (page == Integer.MIN_VALUE && user == null && MathMan.isInteger(args[0])) {
page = Integer.parseInt(args[0]);
@ -68,15 +68,12 @@ public class Visit extends SubCommand {
}
}
break;
}
case 0: {
case 0:
page = 1;
unsorted = PS.get().getPlots(player);
break;
}
default: {
default:
}
}
if (page == Integer.MIN_VALUE) {
page = 1;
@ -85,10 +82,10 @@ public class Visit extends SubCommand {
sendMessage(player, C.FOUND_NO_PLOTS);
return false;
}
Iterator<Plot> iter = unsorted.iterator();
while (iter.hasNext()) {
if (!iter.next().isBasePlot()) {
iter.remove();
Iterator<Plot> iterator = unsorted.iterator();
while (iterator.hasNext()) {
if (!iterator.next().isBasePlot()) {
iterator.remove();
}
}
if (page < 1 || page > unsorted.size()) {

106
Core/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
View File

@ -33,14 +33,14 @@ public class DBFunc {
public static AbstractDB dbManager;
public static void movePlot(Plot originalPlot, Plot newPlot) {
if ((originalPlot.temp == -1) || (newPlot.temp == -1)) {
if (originalPlot.temp == -1 || newPlot.temp == -1) {
return;
}
dbManager.movePlot(originalPlot, newPlot);
DBFunc.dbManager.movePlot(originalPlot, newPlot);
}
public static void validatePlots(Set<Plot> plots) {
dbManager.validateAllPlots(plots);
DBFunc.dbManager.validateAllPlots(plots);
}
/**
@ -74,7 +74,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.setOwner(plot, uuid);
DBFunc.dbManager.setOwner(plot, uuid);
}
/**
@ -83,7 +83,7 @@ public class DBFunc {
* @param plots List containing all plot objects
*/
public static void createPlotsAndData(ArrayList<Plot> plots, Runnable whenDone) {
dbManager.createPlotsAndData(plots, whenDone);
DBFunc.dbManager.createPlotsAndData(plots, whenDone);
}
/**
@ -95,7 +95,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.createPlot(plot);
DBFunc.dbManager.createPlot(plot);
}
/**
@ -107,7 +107,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.createPlotAndSettings(plot, whenDone);
DBFunc.dbManager.createPlotAndSettings(plot, whenDone);
}
/**
@ -116,7 +116,7 @@ public class DBFunc {
* @throws Exception
*/
public static void createTables(String database) throws Exception {
dbManager.createTables();
DBFunc.dbManager.createTables();
}
/**
@ -128,7 +128,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.delete(plot);
DBFunc.dbManager.delete(plot);
plot.temp = -1;
}
@ -140,7 +140,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.deleteRatings(plot);
DBFunc.dbManager.deleteRatings(plot);
}
/**
@ -151,7 +151,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.deleteHelpers(plot);
DBFunc.dbManager.deleteHelpers(plot);
}
/**
@ -162,7 +162,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.deleteTrusted(plot);
DBFunc.dbManager.deleteTrusted(plot);
}
/**
@ -173,7 +173,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.deleteDenied(plot);
DBFunc.dbManager.deleteDenied(plot);
}
/**
@ -184,7 +184,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.deleteComments(plot);
DBFunc.dbManager.deleteComments(plot);
}
/**
@ -199,11 +199,11 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.deleteSettings(plot);
DBFunc.dbManager.deleteSettings(plot);
}
public static void delete(PlotCluster toDelete) {
dbManager.delete(toDelete);
DBFunc.dbManager.delete(toDelete);
}
/**
@ -216,7 +216,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.createPlotSettings(id, plot);
DBFunc.dbManager.createPlotSettings(id, plot);
}
/**
@ -227,32 +227,32 @@ public class DBFunc {
* @return ID
*/
public static int getId(Plot plot) {
return dbManager.getId(plot);
return DBFunc.dbManager.getId(plot);
}
/**
* @return Plots
*/
public static HashMap<String, HashMap<PlotId, Plot>> getPlots() {
return dbManager.getPlots();
return DBFunc.dbManager.getPlots();
}
public static void setMerged(Plot plot, boolean[] merged) {
if (plot.temp == -1) {
return;
}
dbManager.setMerged(plot, merged);
DBFunc.dbManager.setMerged(plot, merged);
}
public static void setFlags(Plot plot, Collection<Flag> flags) {
if (plot.temp == -1) {
return;
}
dbManager.setFlags(plot, flags);
DBFunc.dbManager.setFlags(plot, flags);
}
public static void setFlags(PlotCluster cluster, Collection<Flag> flags) {
dbManager.setFlags(cluster, flags);
DBFunc.dbManager.setFlags(cluster, flags);
}
/**
@ -263,15 +263,15 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.setAlias(plot, alias);
DBFunc.dbManager.setAlias(plot, alias);
}
public static void purgeIds(Set<Integer> uniqueIds) {
dbManager.purgeIds(uniqueIds);
DBFunc.dbManager.purgeIds(uniqueIds);
}
public static void purge(PlotArea area, Set<PlotId> plotIds) {
dbManager.purge(area, plotIds);
DBFunc.dbManager.purge(area, plotIds);
}
/**
@ -282,7 +282,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.setPosition(plot, position);
DBFunc.dbManager.setPosition(plot, position);
}
/**
@ -290,17 +290,17 @@ public class DBFunc {
* @param comment
*/
public static void removeComment(Plot plot, PlotComment comment) {
if ((plot != null) && (plot.temp == -1)) {
if (plot != null && plot.temp == -1) {
return;
}
dbManager.removeComment(plot, comment);
DBFunc.dbManager.removeComment(plot, comment);
}
public static void clearInbox(Plot plot, String inbox) {
if ((plot != null) && (plot.temp == -1)) {
if (plot != null && plot.temp == -1) {
return;
}
dbManager.clearInbox(plot, inbox);
DBFunc.dbManager.clearInbox(plot, inbox);
}
/**
@ -308,20 +308,20 @@ public class DBFunc {
* @param comment
*/
public static void setComment(Plot plot, PlotComment comment) {
if ((plot != null) && (plot.temp == -1)) {
if (plot != null && plot.temp == -1) {
return;
}
dbManager.setComment(plot, comment);
DBFunc.dbManager.setComment(plot, comment);
}
/**
* @param plot
*/
public static void getComments(Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone) {
if ((plot != null) && (plot.temp == -1)) {
if (plot != null && plot.temp == -1) {
return;
}
dbManager.getComments(plot, inbox, whenDone);
DBFunc.dbManager.getComments(plot, inbox, whenDone);
}
/**
@ -332,7 +332,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.removeTrusted(plot, uuid);
DBFunc.dbManager.removeTrusted(plot, uuid);
}
/**
@ -340,14 +340,14 @@ public class DBFunc {
* @param uuid
*/
public static void removeHelper(PlotCluster cluster, UUID uuid) {
dbManager.removeHelper(cluster, uuid);
DBFunc.dbManager.removeHelper(cluster, uuid);
}
/**
* @param cluster
*/
public static void createCluster(PlotCluster cluster) {
dbManager.createCluster(cluster);
DBFunc.dbManager.createCluster(cluster);
}
/**
@ -356,7 +356,7 @@ public class DBFunc {
* @param max
*/
public static void resizeCluster(PlotCluster current, PlotId min, PlotId max) {
dbManager.resizeCluster(current, min, max);
DBFunc.dbManager.resizeCluster(current, min, max);
}
/**
@ -367,7 +367,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.removeMember(plot, uuid);
DBFunc.dbManager.removeMember(plot, uuid);
}
/**
@ -376,7 +376,7 @@ public class DBFunc {
* @param uuid
*/
public static void removeInvited(PlotCluster cluster, UUID uuid) {
dbManager.removeInvited(cluster, uuid);
DBFunc.dbManager.removeInvited(cluster, uuid);
}
/**
@ -387,11 +387,11 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.setTrusted(plot, uuid);
DBFunc.dbManager.setTrusted(plot, uuid);
}
public static void setHelper(PlotCluster cluster, UUID uuid) {
dbManager.setHelper(cluster, uuid);
DBFunc.dbManager.setHelper(cluster, uuid);
}
/**
@ -402,11 +402,11 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.setMember(plot, uuid);
DBFunc.dbManager.setMember(plot, uuid);
}
public static void setInvited(PlotCluster cluster, UUID uuid) {
dbManager.setInvited(cluster, uuid);
DBFunc.dbManager.setInvited(cluster, uuid);
}
/**
@ -417,7 +417,7 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.removeDenied(plot, uuid);
DBFunc.dbManager.removeDenied(plot, uuid);
}
/**
@ -428,33 +428,33 @@ public class DBFunc {
if (plot.temp == -1) {
return;
}
dbManager.setDenied(plot, uuid);
DBFunc.dbManager.setDenied(plot, uuid);
}
public static HashMap<UUID, Integer> getRatings(Plot plot) {
if (plot.temp == -1) {
return new HashMap<>(0);
}
return dbManager.getRatings(plot);
return DBFunc.dbManager.getRatings(plot);
}
public static void setRating(Plot plot, UUID rater, int value) {
if (plot.temp == -1) {
return;
}
dbManager.setRating(plot, rater, value);
DBFunc.dbManager.setRating(plot, rater, value);
}
public static HashMap<String, Set<PlotCluster>> getClusters() {
return dbManager.getClusters();
return DBFunc.dbManager.getClusters();
}
public static void setPosition(PlotCluster cluster, String position) {
dbManager.setPosition(cluster, position);
DBFunc.dbManager.setPosition(cluster, position);
}
public static void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max) {
dbManager.replaceWorld(oldWorld, newWorld, min, max);
DBFunc.dbManager.replaceWorld(oldWorld, newWorld, min, max);
}
/**
@ -463,10 +463,10 @@ public class DBFunc {
* @param now
*/
public static void replaceUUID(UUID old, UUID now) {
dbManager.replaceUUID(old, now);
DBFunc.dbManager.replaceUUID(old, now);
}
public static void close() {
dbManager.close();
DBFunc.dbManager.close();
}
}

184
Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
View File

@ -40,9 +40,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
/**
*/
public class SQLManager implements AbstractDB {
// Public final
public final String SET_OWNER;
@ -187,11 +185,11 @@ public class SQLManager implements AbstractDB {
}
@Override
public void addBatch(PreparedStatement stmt) {
public void addBatch(PreparedStatement statement) {
}
@Override
public void execute(PreparedStatement stmt) {
public void execute(PreparedStatement statement) {
}
};
@ -221,11 +219,11 @@ public class SQLManager implements AbstractDB {
}
@Override
public void addBatch(PreparedStatement stmt) {
public void addBatch(PreparedStatement statement) {
}
@Override
public void execute(PreparedStatement stmt) {
public void execute(PreparedStatement statement) {
}
};
@ -252,11 +250,11 @@ public class SQLManager implements AbstractDB {
}
@Override
public void addBatch(PreparedStatement stmt) {
public void addBatch(PreparedStatement statement) {
}
@Override
public void execute(PreparedStatement stmt) {
public void execute(PreparedStatement statement) {
}
};
@ -294,7 +292,7 @@ public class SQLManager implements AbstractDB {
this.connection.setAutoCommit(false);
}
String method = null;
PreparedStatement stmt = null;
PreparedStatement statement = null;
UniqueStatement task = null;
UniqueStatement lastTask = null;
for (Entry<Plot, Queue<UniqueStatement>> entry : this.plotTasks.entrySet()) {
@ -306,22 +304,22 @@ public class SQLManager implements AbstractDB {
task = this.plotTasks.get(plot).remove();
count++;
if (task != null) {
if (task._method == null || !task._method.equals(method)) {
if (stmt != null) {
lastTask.execute(stmt);
stmt.close();
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task._method;
stmt = task.get();
method = task.method;
statement = task.get();
}
task.set(stmt);
task.addBatch(stmt);
task.set(statement);
task.addBatch(statement);
}
lastTask = task;
}
if (stmt != null && task != null) {
task.execute(stmt);
stmt.close();
if (statement != null && task != null) {
task.execute(statement);
statement.close();
}
}
if (!this.playerTasks.isEmpty()) {
@ -330,7 +328,7 @@ public class SQLManager implements AbstractDB {
this.connection.setAutoCommit(false);
}
String method = null;
PreparedStatement stmt = null;
PreparedStatement statement = null;
UniqueStatement task = null;
UniqueStatement lastTask = null;
for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
@ -342,22 +340,22 @@ public class SQLManager implements AbstractDB {
task = this.playerTasks.get(uuid).remove();
count++;
if (task != null) {
if (task._method == null || !task._method.equals(method)) {
if (stmt != null) {
lastTask.execute(stmt);
stmt.close();
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task._method;
stmt = task.get();
method = task.method;
statement = task.get();
}
task.set(stmt);
task.addBatch(stmt);
task.set(statement);
task.addBatch(statement);
}
lastTask = task;
}
if (stmt != null && task != null) {
task.execute(stmt);
stmt.close();
if (statement != null && task != null) {
task.execute(statement);
statement.close();
}
}
if (!this.clusterTasks.isEmpty()) {
@ -366,7 +364,7 @@ public class SQLManager implements AbstractDB {
this.connection.setAutoCommit(false);
}
String method = null;
PreparedStatement stmt = null;
PreparedStatement statement = null;
UniqueStatement task = null;
UniqueStatement lastTask = null;
for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks.entrySet()) {
@ -378,22 +376,22 @@ public class SQLManager implements AbstractDB {
task = this.clusterTasks.get(cluster).remove();
count++;
if (task != null) {
if (task._method == null || !task._method.equals(method)) {
if (stmt != null) {
lastTask.execute(stmt);
stmt.close();
if (task.method == null || !task.method.equals(method)) {
if (statement != null) {
lastTask.execute(statement);
statement.close();
}
method = task._method;
stmt = task.get();
method = task.method;
statement = task.get();
}
task.set(stmt);
task.addBatch(stmt);
task.set(statement);
task.addBatch(statement);
}
lastTask = task;
}
if (stmt != null && task != null) {
task.execute(stmt);
stmt.close();
if (statement != null && task != null) {
task.execute(statement);
statement.close();
}
}
if (count > 0) {
@ -614,7 +612,7 @@ public class SQLManager implements AbstractDB {
try {
stmt.setString(i * 5 + 3, plot.owner.toString());
} catch (SQLException e) {
stmt.setString(i * 5 + 3, everyone.toString());
stmt.setString(i * 5 + 3, AbstractDB.everyone.toString());
}
stmt.setString(i * 5 + 4, plot.getArea().toString());
stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp()));
@ -628,7 +626,7 @@ public class SQLManager implements AbstractDB {
try {
stmt.setString(i * 6 + 4, plot.owner.toString());
} catch (SQLException e1) {
stmt.setString(i * 6 + 4, everyone.toString());
stmt.setString(i * 6 + 4, AbstractDB.everyone.toString());
}
stmt.setString(i * 6 + 5, plot.getArea().toString());
stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp()));
@ -989,14 +987,14 @@ public class SQLManager implements AbstractDB {
}
@Override
public void execute(PreparedStatement stmt) {
public void execute(PreparedStatement statement) {
}
@Override
public void addBatch(PreparedStatement stmt) throws SQLException {
stmt.executeUpdate();
ResultSet keys = stmt.getGeneratedKeys();
public void addBatch(PreparedStatement statement) throws SQLException {
statement.executeUpdate();
ResultSet keys = statement.getGeneratedKeys();
if (keys.next()) {
plot.temp = keys.getInt(1);
}
@ -1476,8 +1474,9 @@ public class SQLManager implements AbstractDB {
if (this.mySQL && !PS.get().checkVersion(oldVersion, 3, 3, 2)) {
try (Statement stmt = this.connection.createStatement()) {
stmt.executeUpdate("ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
} catch (SQLException ignore) {
//ignored
}
catch (SQLException ignore) {}
}
DatabaseMetaData data = this.connection.getMetaData();
ResultSet rs = data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
@ -1599,7 +1598,7 @@ public class SQLManager implements AbstractDB {
*/
@Override
public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
HashMap<String, HashMap<PlotId, Plot>> newplots = new HashMap<>();
HashMap<String, HashMap<PlotId, Plot>> newPlots = new HashMap<>();
HashMap<Integer, Plot> plots = new HashMap<>();
try {
HashSet<String> areas = new HashSet<>();
@ -1660,7 +1659,7 @@ public class SQLManager implements AbstractDB {
long time = timestamp.getTime();
Plot p = new Plot(plot_id, user, new HashSet<UUID>(), new HashSet<UUID>(), new HashSet<UUID>(), "", null, null, null,
new boolean[]{false, false, false, false}, time, id);
HashMap<PlotId, Plot> map = newplots.get(areaid);
HashMap<PlotId, Plot> map = newPlots.get(areaid);
if (map != null) {
Plot last = map.put(p.getId(), p);
if (last != null) {
@ -1675,7 +1674,7 @@ public class SQLManager implements AbstractDB {
}
} else {
map = new HashMap<>();
newplots.put(areaid, map);
newPlots.put(areaid, map);
map.put(p.getId(), p);
}
plots.put(id, p);
@ -1872,9 +1871,9 @@ public class SQLManager implements AbstractDB {
}
boolean invalidPlot = false;
for (Entry<String, AtomicInteger> entry : noExist.entrySet()) {
String worldname = entry.getKey();
String worldName = entry.getKey();
invalidPlot = true;
PS.debug("&c[WARNING] Found " + entry.getValue().intValue() + " plots in DB for non existant world; '" + worldname + "'.");
PS.debug("&c[WARNING] Found " + entry.getValue().intValue() + " plots in DB for non existent world; '" + worldName + "'.");
}
if (invalidPlot) {
PS.debug("&c[WARNING] - Please create the world/s or remove the plots using the purge command");
@ -1883,7 +1882,7 @@ public class SQLManager implements AbstractDB {
PS.debug("&7[WARN] " + "Failed to load plots.");
e.printStackTrace();
}
return newplots;
return newPlots;
}
@Override
@ -2072,9 +2071,9 @@ public class SQLManager implements AbstractDB {
e.printStackTrace();
PS.debug("&c[ERROR] " + "FAILED TO PURGE AREA '" + area + "'!");
}
for (Iterator<PlotId> iter = plots.iterator(); iter.hasNext(); ) {
PlotId plotId = iter.next();
iter.remove();
for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
PlotId plotId = iterator.next();
iterator.remove();
PlotId id = new PlotId(plotId.x, plotId.y);
area.removePlot(id);
}
@ -2178,7 +2177,7 @@ public class SQLManager implements AbstractDB {
}
@Override
public void execute(PreparedStatement stmt) {
public void execute(PreparedStatement statement) {
}
@Override
@ -2480,11 +2479,12 @@ public class SQLManager implements AbstractDB {
}
@Override
public void execute(PreparedStatement stmt) {}
public void execute(PreparedStatement statement) {
}
@Override
public void addBatch(PreparedStatement stmt) throws SQLException {
ResultSet resultSet = stmt.executeQuery();
public void addBatch(PreparedStatement statement) throws SQLException {
ResultSet resultSet = statement.executeQuery();
Map<String, byte[]> metaMap = new HashMap<>();
@ -2673,7 +2673,7 @@ public class SQLManager implements AbstractDB {
for (Entry<String, Integer> entry : noExist.entrySet()) {
String a = entry.getKey();
invalidPlot = true;
PS.debug("&c[WARNING] Found " + noExist.get(a) + " clusters in DB for non existant area; '" + a + "'.");
PS.debug("&c[WARNING] Found " + noExist.get(a) + " clusters in DB for non existent area; '" + a + "'.");
}
if (invalidPlot) {
PS.debug("&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
@ -2782,14 +2782,14 @@ public class SQLManager implements AbstractDB {
}
@Override
public void execute(PreparedStatement stmt) {
public void execute(PreparedStatement statement) {
}
@Override
public void addBatch(PreparedStatement stmt) throws SQLException {
stmt.executeUpdate();
ResultSet keys = stmt.getGeneratedKeys();
public void addBatch(PreparedStatement statement) throws SQLException {
statement.executeUpdate();
ResultSet keys = statement.getGeneratedKeys();
if (keys.next()) {
cluster.temp = keys.getInt(1);
}
@ -2943,29 +2943,29 @@ public class SQLManager implements AbstractDB {
if (plot.temp == -1) {
continue;
}
HashMap<PlotId, Plot> worldplots = database.get(plot.getArea().toString());
if (worldplots == null) {
HashMap<PlotId, Plot> worldPlots = database.get(plot.getArea().toString());
if (worldPlots == null) {
PS.debug("&8 - &7Creating plot (1): " + plot);
toCreate.add(plot);
continue;
}
Plot dataplot = worldplots.remove(plot.getId());
if (dataplot == null) {
Plot dataPlot = worldPlots.remove(plot.getId());
if (dataPlot == null) {
PS.debug("&8 - &7Creating plot (2): " + plot);
toCreate.add(plot);
continue;
}
// owner
if (!plot.owner.equals(dataplot.owner)) {
if (!plot.owner.equals(dataPlot.owner)) {
PS.debug("&8 - &7Setting owner: " + plot + " -> " + MainUtil.getName(plot.owner));
setOwner(plot, plot.owner);
}
// trusted
if (!plot.getTrusted().equals(dataplot.getTrusted())) {
if (!plot.getTrusted().equals(dataPlot.getTrusted())) {
HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getTrusted().clone();
HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getTrusted().clone();
toRemove.removeAll(plot.getTrusted());
toAdd.removeAll(dataplot.getTrusted());
toAdd.removeAll(dataPlot.getTrusted());
PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: " + plot);
if (!toRemove.isEmpty()) {
for (UUID uuid : toRemove) {
@ -2978,11 +2978,11 @@ public class SQLManager implements AbstractDB {
}
}
}
if (!plot.getMembers().equals(dataplot.getMembers())) {
if (!plot.getMembers().equals(dataPlot.getMembers())) {
HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getMembers().clone();
HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getMembers().clone();
toRemove.removeAll(plot.getMembers());
toAdd.removeAll(dataplot.getMembers());
toAdd.removeAll(dataPlot.getMembers());
PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: " + plot);
if (!toRemove.isEmpty()) {
for (UUID uuid : toRemove) {
@ -2995,11 +2995,11 @@ public class SQLManager implements AbstractDB {
}
}
}
if (!plot.getDenied().equals(dataplot.getDenied())) {
if (!plot.getDenied().equals(dataPlot.getDenied())) {
HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getDenied().clone();
HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getDenied().clone();
toRemove.removeAll(plot.getDenied());
toAdd.removeAll(dataplot.getDenied());
toAdd.removeAll(dataPlot.getDenied());
PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: " + plot);
if (!toRemove.isEmpty()) {
for (UUID uuid : toRemove) {
@ -3013,13 +3013,13 @@ public class SQLManager implements AbstractDB {
}
}
boolean[] pm = plot.getMerged();
boolean[] dm = dataplot.getMerged();
boolean[] dm = dataPlot.getMerged();
if (pm[0] != dm[0] || pm[1] != dm[1]) {
PS.debug("&8 - &7Correcting merge for: " + plot);
setMerged(dataplot, plot.getMerged());
setMerged(dataPlot, plot.getMerged());
}
HashMap<String, Flag> pf = plot.getFlags();
HashMap<String, Flag> df = dataplot.getFlags();
HashMap<String, Flag> df = dataPlot.getFlags();
if (!pf.isEmpty() && !df.isEmpty()) {
if (pf.size() != df.size() || !StringMan.isEqual(StringMan.joinOrdered(pf.values(), ","), StringMan.joinOrdered(df.values(), ","))) {
PS.debug("&8 - &7Correcting flags for: " + plot);
@ -3146,18 +3146,18 @@ public class SQLManager implements AbstractDB {
public abstract class UniqueStatement {
public String _method;
public String method;
public UniqueStatement(String method) {
this._method = method;
this.method = method;
}
public void addBatch(PreparedStatement stmt) throws SQLException {
stmt.addBatch();
public void addBatch(PreparedStatement statement) throws SQLException {
statement.addBatch();
}
public void execute(PreparedStatement stmt) throws SQLException {
stmt.executeBatch();
public void execute(PreparedStatement statement) throws SQLException {
statement.executeBatch();
}
public abstract PreparedStatement get() throws SQLException;

4
Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java
View File

@ -11,7 +11,7 @@ public abstract class StmtMod<T> {
public String getCreateMySQL(int size, String query, int params) {
StringBuilder statement = new StringBuilder(query);
for (int i = 0; i < (size - 1); i++) {
for (int i = 0; i < size - 1; i++) {
statement.append("(" + StringMan.repeat(",?", params).substring(1) + "),");
}
statement.append("(" + StringMan.repeat(",?", params).substring(1) + ")");
@ -21,7 +21,7 @@ public abstract class StmtMod<T> {
public String getCreateSQLite(int size, String query, int params) {
StringBuilder statement = new StringBuilder(query);
String modParams = StringMan.repeat(",?", params).substring(1);
for (int i = 0; i < (size - 1); i++) {
for (int i = 0; i < size - 1; i++) {
statement.append("UNION SELECT " + modParams + " ");
}
return statement.toString();

34
Core/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
View File

@ -11,8 +11,8 @@ import com.intellectualcrafters.plot.util.StringMan;
public class AbstractFlag {
public final String key;
public final FlagValue<?> value;
public AbstractFlag(final String key) {
public AbstractFlag(String key) {
this(key, new FlagValue.StringValue());
}
@ -21,7 +21,7 @@ public class AbstractFlag {
* The key must be alphabetical characters and &lt;= 16 characters in length
* @param key
*/
public AbstractFlag(final String key, final FlagValue<?> value) {
public AbstractFlag(String key, FlagValue<?> value) {
if (!StringMan.isAlpha(key.replaceAll("_", "").replaceAll("-", ""))) {
throw new IllegalArgumentException("Flag must be alphabetic characters");
}
@ -37,23 +37,23 @@ public class AbstractFlag {
}
public boolean isList() {
return value instanceof FlagValue.ListValue;
return this.value instanceof FlagValue.ListValue;
}
public Object parseValueRaw(final String value) {
public Object parseValueRaw(String value) {
try {
return this.value.parse(value);
} catch (final Exception e) {
} catch (Exception e) {
return null;
}
}
public String toString(final Object t) {
return value.toString(t);
public String toString(Object t) {
return this.value.toString(t);
}
public String getValueDesc() {
return value.getDescription();
return this.value.getDescription();
}
/**
@ -62,28 +62,28 @@ public class AbstractFlag {
* @return String
*/
public String getKey() {
return key;
return this.key;
}
@Override
public String toString() {
return key;
return this.key;
}
@Override
public int hashCode() {
return key.hashCode();
return this.key.hashCode();
}
@Override
public boolean equals(final Object other) {
public boolean equals(Object other) {
if (other == this) {
return true;
}
if (!(other instanceof AbstractFlag)) {
return false;
}
final AbstractFlag otherObj = (AbstractFlag) other;
return otherObj.key.equals(key);
AbstractFlag otherObj = (AbstractFlag) other;
return otherObj.key.equals(this.key);
}
}

16
Core/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
View File

@ -4,6 +4,7 @@ import com.intellectualcrafters.plot.object.PlotBlock;
import com.intellectualcrafters.plot.util.StringComparison;
import com.intellectualcrafters.plot.util.StringMan;
import com.intellectualcrafters.plot.util.WorldUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@ -26,7 +27,7 @@ public abstract class FlagValue<T> {
}
public boolean validValue(Object value) {
return (value != null) && (value.getClass() == this.clazz);
return value != null && value.getClass() == this.clazz;
}
public String toString(Object t) {
@ -59,18 +60,15 @@ public abstract class FlagValue<T> {
case "1":
case "yes":
case "allow":
case "true": {
case "true":
return true;
}
case "0":
case "no":
case "deny":
case "false": {
case "false":
return false;
}
default: {
default:
return null;
}
}
}
@ -291,7 +289,7 @@ public abstract class FlagValue<T> {
return new PlotBlock(id, data);
} catch (Exception e) {
StringComparison<PlotBlock>.ComparisonResult value = WorldUtil.IMP.getClosestBlock(t);
if ((value == null) || (value.match > 1)) {
if (value == null || value.match > 1) {
return null;
}
return value.best;
@ -339,7 +337,7 @@ public abstract class FlagValue<T> {
block = new PlotBlock(id, data);
} catch (Exception e) {
StringComparison<PlotBlock>.ComparisonResult value = WorldUtil.IMP.getClosestBlock(t);
if ((value == null) || (value.match > 1)) {
if (value == null || value.match > 1) {
continue;
}
block = value.best;

26
Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
View File

@ -20,38 +20,30 @@ public class ClassicPlotManager extends SquarePlotManager {
@Override
public boolean setComponent(PlotArea plotworld, PlotId plotid, String component, PlotBlock[] blocks) {
switch (component) {
case "floor": {
case "floor":
setFloor(plotworld, plotid, blocks);
return true;
}
case "wall": {
case "wall":
setWallFilling(plotworld, plotid, blocks);
return true;
}
case "all": {
case "all":
setAll(plotworld, plotid, blocks);
return true;
}
case "air": {
case "air":
setAir(plotworld, plotid, blocks);
return true;
}
case "main": {
case "main":
setMain(plotworld, plotid, blocks);
return true;
}
case "middle": {
case "middle":
setMiddle(plotworld, plotid, blocks);
return true;
}
case "outline": {
case "outline":
setOutline(plotworld, plotid, blocks);
return true;
}
case "border": {
case "border":
setWall(plotworld, plotid, blocks);
return true;
}
}
return false;
}
@ -459,6 +451,6 @@ public class ClassicPlotManager extends SquarePlotManager {
ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
plot = plot.getBasePlot(false);
Location bot = plot.getBottomAbs();
return new com.intellectualcrafters.plot.object.Location(plotworld.worldname, bot.getX() - 1, dpw.ROAD_HEIGHT + 1, bot.getZ() - 2);
return new Location(plotworld.worldname, bot.getX() - 1, dpw.ROAD_HEIGHT + 1, bot.getZ() - 2);
}
}

41
Core/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
View File

@ -172,23 +172,24 @@ public class HybridPlotWorld extends ClassicPlotWorld {
public void setupSchematics() {
this.G_SCH = new HashMap<>();
File schem1File = MainUtil.getFile(PS.get().IMP.getDirectory(), "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/sideroad.schematic");
File schem2File =
File schematic1File =
MainUtil.getFile(PS.get().IMP.getDirectory(), "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/sideroad.schematic");
File schematic2File =
MainUtil.getFile(PS.get().IMP.getDirectory(), "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/intersection.schematic");
File schem3File = MainUtil.getFile(PS.get().IMP.getDirectory(), "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/plot.schematic");
Schematic schem1 = SchematicHandler.manager.getSchematic(schem1File);
Schematic schem2 = SchematicHandler.manager.getSchematic(schem2File);
Schematic schem3 = SchematicHandler.manager.getSchematic(schem3File);
Schematic schematic1 = SchematicHandler.manager.getSchematic(schematic1File);
Schematic schematic2 = SchematicHandler.manager.getSchematic(schematic2File);
Schematic schematic3 = SchematicHandler.manager.getSchematic(schem3File);
int shift = this.ROAD_WIDTH / 2;
int oddshift = 0;
if ((this.ROAD_WIDTH & 1) != 0) {
oddshift = 1;
}
if (schem3 != null) {
if (schematic3 != null) {
this.PLOT_SCHEMATIC = true;
short[] ids = schem3.getIds();
byte[] datas = schem3.getDatas();
Dimension d3 = schem3.getSchematicDimension();
short[] ids = schematic3.getIds();
byte[] datas = schematic3.getDatas();
Dimension d3 = schematic3.getSchematicDimension();
short w3 = (short) d3.getX();
short l3 = (short) d3.getZ();
short h3 = (short) d3.getY();
@ -214,7 +215,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
}
}
}
HashSet<PlotItem> items = schem3.getItems();
HashSet<PlotItem> items = schematic3.getItems();
if (items != null) {
this.G_SCH_STATE = new HashMap<>();
for (PlotItem item : items) {
@ -235,7 +236,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
}
}
}
if (schem1 == null || schem2 == null || this.ROAD_WIDTH == 0) {
if (schematic1 == null || schematic2 == null || this.ROAD_WIDTH == 0) {
PS.debug(C.PREFIX + "&3 - schematic: &7false");
return;
}
@ -243,17 +244,17 @@ public class HybridPlotWorld extends ClassicPlotWorld {
// Do not populate road if using schematic population
this.ROAD_BLOCK = new PlotBlock(this.ROAD_BLOCK.id, (byte) 0);
short[] ids1 = schem1.getIds();
byte[] datas1 = schem1.getDatas();
short[] ids1 = schematic1.getIds();
byte[] datas1 = schematic1.getDatas();
short[] ids2 = schem2.getIds();
byte[] datas2 = schem2.getDatas();
short[] ids2 = schematic2.getIds();
byte[] datas2 = schematic2.getDatas();
Dimension d1 = schem1.getSchematicDimension();
Dimension d1 = schematic1.getSchematicDimension();
short w1 = (short) d1.getX();
short l1 = (short) d1.getZ();
short h1 = (short) d1.getY();
Dimension d2 = schem2.getSchematicDimension();
Dimension d2 = schematic2.getSchematicDimension();
short w2 = (short) d2.getX();
short l2 = (short) d2.getZ();
short h2 = (short) d2.getY();
@ -293,9 +294,9 @@ public class HybridPlotWorld extends ClassicPlotWorld {
x += this.SIZE;
}
if (rotate) {
byte newdata = rotate(id, data);
if (data != 0 || newdata != 0) {
data = newdata;
byte newData = rotate(id, data);
if (data != 0 || newData != 0) {
data = newData;
}
}
int pair = MathMan.pair(x, z);

28
Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
View File

@ -223,9 +223,9 @@ public abstract class HybridUtils {
}
if (chunks.size() < 1024) {
if (!regions.isEmpty()) {
Iterator<ChunkLoc> iter = regions.iterator();
ChunkLoc loc = iter.next();
iter.remove();
Iterator<ChunkLoc> iterator = regions.iterator();
ChunkLoc loc = iterator.next();
iterator.remove();
PS.debug("&3Updating .mcr: " + loc.x + ", " + loc.z + " (aprrox 1024 chunks)");
PS.debug(" - Remaining: " + regions.size());
chunks.addAll(getChunks(loc));
@ -237,9 +237,9 @@ public abstract class HybridUtils {
if (System.currentTimeMillis() - baseTime - last.get() > 2000 && last.get() != 0) {
last.set(0);
PS.debug(C.PREFIX.s() + "Detected low TPS. Rescheduling in 30s");
Iterator<ChunkLoc> iter = chunks.iterator();
final ChunkLoc chunk = iter.next();
iter.remove();
Iterator<ChunkLoc> iterator = chunks.iterator();
final ChunkLoc chunk = iterator.next();
iterator.remove();
TaskManager.runTask(new Runnable() {
@Override
public void run() {
@ -252,9 +252,9 @@ public abstract class HybridUtils {
}
if (System.currentTimeMillis() - baseTime - last.get() < 1500 && last.get() != 0) {
while (System.currentTimeMillis() < diff && !chunks.isEmpty()) {
Iterator<ChunkLoc> iter = chunks.iterator();
final ChunkLoc chunk = iter.next();
iter.remove();
Iterator<ChunkLoc> iterator = chunks.iterator();
final ChunkLoc chunk = iterator.next();
iterator.remove();
TaskManager.runTask(new Runnable() {
@Override
public void run() {
@ -267,9 +267,9 @@ public abstract class HybridUtils {
}
} catch (Exception e) {
e.printStackTrace();
Iterator<ChunkLoc> iter = regions.iterator();
ChunkLoc loc = iter.next();
iter.remove();
Iterator<ChunkLoc> iterator = regions.iterator();
ChunkLoc loc = iterator.next();
iterator.remove();
PS.debug("&c[ERROR]&7 Could not update '" + area.worldname + "/region/r." + loc.x + "." + loc.z
+ ".mca' (Corrupt chunk?)");
int sx = loc.x << 5;
@ -311,12 +311,12 @@ public abstract class HybridUtils {
int tz = sz - 1;
int ty = get_ey(world, sx, ex, bz, tz, sy);
Set<RegionWrapper> sideroad = new HashSet<>(Collections.singletonList(new RegionWrapper(sx, ex, sy, ey, sz, ez)));
Set<RegionWrapper> sideRoad = new HashSet<>(Collections.singletonList(new RegionWrapper(sx, ex, sy, ey, sz, ez)));
final Set<RegionWrapper> intersection = new HashSet<>(Collections.singletonList(new RegionWrapper(sx, ex, sy, ty, bz, tz)));
final String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot
.getArea().toString() + File.separator;
SchematicHandler.manager.getCompoundTag(world, sideroad, new RunnableVal<CompoundTag>() {
SchematicHandler.manager.getCompoundTag(world, sideRoad, new RunnableVal<CompoundTag>() {
@Override
public void run(CompoundTag value) {
SchematicHandler.manager.save(value, dir + "sideroad.schematic");

6
Core/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
View File

@ -28,9 +28,9 @@ public abstract class SquarePlotManager extends GridPlotManager {
whenDone.run();
return;
}
Iterator<RegionWrapper> iter = regions.iterator();
RegionWrapper region = iter.next();
iter.remove();
Iterator<RegionWrapper> iterator = regions.iterator();
RegionWrapper region = iterator.next();
iterator.remove();
Location pos1 = new Location(plot.getArea().worldname, region.minX, region.minY, region.minZ);
Location pos2 = new Location(plot.getArea().worldname, region.maxX, region.maxY, region.maxZ);
ChunkManager.manager.regenerateRegion(pos1, pos2, false, this);

4
Core/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java
View File

@ -11,8 +11,8 @@ public abstract class SquarePlotWorld extends GridPlotWorld {
public int ROAD_OFFSET_X = 0;
public int ROAD_OFFSET_Z = 0;
public SquarePlotWorld(String worldname, String id, IndependentPlotGenerator generator, PlotId min, PlotId max) {
super(worldname, id, generator, min, max);
public SquarePlotWorld(String worldName, String id, IndependentPlotGenerator generator, PlotId min, PlotId max) {
super(worldName, id, generator, min, max);
}
@Override

10
Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
View File

@ -81,12 +81,12 @@ public class PlotAnalysis {
TaskManager.runTaskAsync(new Runnable() {
@Override
public void run() {
Iterator<Plot> iter = plots.iterator();
Iterator<Plot> iterator = plots.iterator();
PS.debug(" - $1Reducing " + plots.size() + " plots to those with sufficient data");
while (iter.hasNext()) {
Plot plot = iter.next();
while (iterator.hasNext()) {
Plot plot = iterator.next();
if (plot.getSettings().ratings == null || plot.getSettings().getRatings().isEmpty()) {
iter.remove();
iterator.remove();
} else {
plot.addRunning();
}
@ -393,7 +393,7 @@ public class PlotAnalysis {
}
/**
* Get correllation coefficient.
* Get correlation coefficient.
* @return
*/
public static double getCC(int n, int sum) {

26
Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java
View File

@ -72,8 +72,8 @@ public abstract class PlotArea {
private ConcurrentHashMap<String, Object> meta;
private QuadMap<PlotCluster> clusters;
public PlotArea(String worldname, String id, IndependentPlotGenerator generator, PlotId min, PlotId max) {
this.worldname = worldname;
public PlotArea(String worldName, String id, IndependentPlotGenerator generator, PlotId min, PlotId max) {
this.worldname = worldName;
this.id = id;
this.manager = generator != null ? generator.getNewPlotManager() : null;
this.generator = generator;
@ -87,7 +87,7 @@ public abstract class PlotArea {
this.min = min;
this.max = max;
}
this.worldhash = worldname.hashCode();
this.worldhash = worldName.hashCode();
}
/**
@ -303,7 +303,7 @@ public abstract class PlotArea {
public abstract void loadConfiguration(ConfigurationSection config);
/**
* Saving core plotarea settings
* Saving core PlotArea settings
*
* @param config Configuration Section
*/
@ -457,16 +457,16 @@ public abstract class PlotArea {
}
public Set<Plot> getPlotsAbs(final UUID uuid) {
final HashSet<Plot> myplots = new HashSet<>();
final HashSet<Plot> myPlots = new HashSet<>();
foreachPlotAbs(new RunnableVal<Plot>() {
@Override
public void run(Plot value) {
if (value.owner.equals(uuid)) {
myplots.add(value);
myPlots.add(value);
}
}
});
return myplots;
return myPlots;
}
public Set<Plot> getPlots(UUID uuid) {
@ -595,14 +595,14 @@ public abstract class PlotArea {
}
public Set<Plot> getBasePlots() {
HashSet<Plot> myplots = new HashSet<>(getPlots());
Iterator<Plot> iter = myplots.iterator();
while (iter.hasNext()) {
if (!iter.next().isBasePlot()) {
iter.remove();
HashSet<Plot> myPlots = new HashSet<>(getPlots());
Iterator<Plot> iterator = myPlots.iterator();
while (iterator.hasNext()) {
if (!iterator.next().isBasePlot()) {
iterator.remove();
}
}
return myplots;
return myPlots;
}
public void foreachPlotAbs(RunnableVal<Plot> run) {

6
Core/src/main/java/com/intellectualcrafters/plot/object/Rating.java
View File

@ -18,7 +18,7 @@ public class Rating {
public Rating(int value) {
this.initial = value;
this.ratingMap = new HashMap<>();
if ((Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() > 1)) {
if (Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 1) {
if (value < 10) {
for (String ratingCategory : Settings.RATING_CATEGORIES) {
this.ratingMap.put(ratingCategory, value);
@ -27,7 +27,7 @@ public class Rating {
return;
}
for (String ratingCategory : Settings.RATING_CATEGORIES) {
this.ratingMap.put(ratingCategory, (value % 10) - 1);
this.ratingMap.put(ratingCategory, value % 10 - 1);
value = value / 10;
}
} else {
@ -66,7 +66,7 @@ public class Rating {
if (!this.changed) {
return this.initial;
}
if ((Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() > 1)) {
if (Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 1) {
int val = 0;
for (int i = 0; i < Settings.RATING_CATEGORIES.size(); i++) {
val += (i + 1) * Math.pow(10, this.ratingMap.get(Settings.RATING_CATEGORIES.get(i)));

35
Core/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java
View File

@ -7,17 +7,17 @@ public class RegionWrapper {
public final int maxY;
public final int minZ;
public final int maxZ;
public RegionWrapper(final int minX, final int maxX, final int minZ, final int maxZ) {
public RegionWrapper(int minX, int maxX, int minZ, int maxZ) {
this.maxX = maxX;
this.minX = minX;
this.maxZ = maxZ;
this.minZ = minZ;
minY = 0;
maxY = 256;
this.minY = 0;
this.maxY = 256;
}
public RegionWrapper(final int minX, final int maxX, final int minY, final int maxY, final int minZ, final int maxZ) {
public RegionWrapper(int minX, int maxX, int minY, int maxY, int minZ, int maxZ) {
this.maxX = maxX;
this.minX = minX;
this.maxZ = maxZ;
@ -25,13 +25,13 @@ public class RegionWrapper {
this.minY = minY;
this.maxY = maxY;
}
public boolean isIn(final int x, final int y, final int z) {
return x >= minX && x <= maxX && z >= minZ && z <= maxZ && y >= minY && y <= maxY;
public boolean isIn(int x, int y, int z) {
return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ && y >= this.minY && y <= this.maxY;
}
public boolean isIn(final int x, final int z) {
return x >= minX && x <= maxX && z >= minZ && z <= maxZ;
public boolean isIn(int x, int z) {
return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ;
}
public boolean intersects(RegionWrapper other) {
@ -40,7 +40,7 @@ public class RegionWrapper {
@Override
public int hashCode() {
return minX + 13 * maxX + 23 * minZ + 39 * maxZ;
return this.minX + 13 * this.maxX + 23 * this.minZ + 39 * this.maxZ;
}
@Override
@ -53,19 +53,20 @@ public class RegionWrapper {
}
if (obj instanceof RegionWrapper) {
RegionWrapper other = (RegionWrapper) obj;
return minX == other.minX && minZ == other.minZ && minY == other.minY && maxX == other.maxX && maxZ == other.maxZ && maxY == other.maxY;
return this.minX == other.minX && this.minZ == other.minZ && this.minY == other.minY && this.maxX == other.maxX && this.maxZ == other.maxZ
&& this.maxY == other.maxY;
}
return false;
}
@Override
public String toString() {
return minX + "->" + maxX + "," + minZ + "->" + maxZ;
return this.minX + "->" + this.maxX + "," + this.minZ + "->" + this.maxZ;
}
public Location[] getCorners(String world) {
Location pos1 = new Location(world, minX, minY, minZ);
Location pos2 = new Location(world, maxX, maxY, maxZ);
Location pos1 = new Location(world, this.minX, this.minY, this.minZ);
Location pos2 = new Location(world, this.maxX, this.maxY, this.maxZ);
return new Location[] { pos1, pos2 };
}
}

2
Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java
View File

@ -11,7 +11,7 @@ public abstract class RunnableVal<T> implements Runnable {
@Override
public void run() {
run(value);
run(this.value);
}
public abstract void run(T value);

2
Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal2.java
View File

@ -13,7 +13,7 @@ public abstract class RunnableVal2<T, U> implements Runnable {
@Override
public void run() {
run(value1, value2);
run(this.value1, this.value2);
}
public abstract void run(T value1, U value2);

8
Core/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
View File

@ -128,14 +128,14 @@ public class ExpireManager {
}
final Runnable task = this;
long start = System.currentTimeMillis();
Iterator<Plot> iter = plots.iterator();
while (iter.hasNext() && System.currentTimeMillis() - start < 2) {
Iterator<Plot> iterator = plots.iterator();
while (iterator.hasNext() && System.currentTimeMillis() - start < 2) {
if (ExpireManager.this.running != 2) {
ExpireManager.this.running = 0;
return;
}
final Plot plot = iter.next();
iter.remove();
final Plot plot = iterator.next();
iterator.remove();
if (!isExpired(plot)) {
continue;
}

34
Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -222,35 +222,31 @@ public class MainUtil {
case "week":
case "weeks":
case "wks":
case "w": {
case "w":
time += 604800 * nums;
}
case "days":
case "day":
case "d": {
case "d":
time += 86400 * nums;
}
case "hour":
case "hr":
case "hrs":
case "hours":
case "h": {
case "h":
time += 3600 * nums;
}
case "minutes":
case "minute":
case "mins":
case "min":
case "m": {
case "m":
time += 60 * nums;
}
case "seconds":
case "second":
case "secs":
case "sec":
case "s": {
case "s":
time += nums;
}
}
}
return time;
@ -277,19 +273,19 @@ public class MainUtil {
}
/**
* Get a list of plot ids within a selection
* Get a list of plot ids within a selection.
* @param pos1
* @param pos2
* @return
*/
public static ArrayList<PlotId> getPlotSelectionIds(PlotId pos1, PlotId pos2) {
ArrayList<PlotId> myplots = new ArrayList<>();
ArrayList<PlotId> myPlots = new ArrayList<>();
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {
myplots.add(new PlotId(x, y));
myPlots.add(new PlotId(x, y));
}
}
return myplots;
return myPlots;
}
/**
@ -346,7 +342,7 @@ public class MainUtil {
}
/**
* Fuzzy plot search with spaces separating terms<br>
* Fuzzy plot search with spaces separating terms.
* - Terms: type, alias, world, owner, trusted, member
* @param search
* @return
@ -421,7 +417,7 @@ public class MainUtil {
}
/**
* Get the plot from a string<br>
* Get the plot from a string.
* @param player Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
* @param arg The search term
* @param message If a message should be sent to the player if a plot cannot be found
@ -533,13 +529,13 @@ public class MainUtil {
* @param world
* @param pos1
* @param pos2
* @param newblock
* @param newBlock
*/
public static void setSimpleCuboidAsync(String world, Location pos1, Location pos2, PlotBlock newblock) {
public static void setSimpleCuboidAsync(String world, Location pos1, Location pos2, PlotBlock newBlock) {
for (int y = pos1.getY(); y <= Math.min(255, pos2.getY()); y++) {
for (int x = pos1.getX(); x <= pos2.getX(); x++) {
for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
SetQueue.IMP.setBlock(world, x, y, z, newblock);
SetQueue.IMP.setBlock(world, x, y, z, newBlock);
}
}
}

146
Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java
View File

@ -1,30 +1,50 @@
package com.intellectualcrafters.plot.util;
public class MathMan {
public static double getMean(final int[] array) {
private static final int ATAN2_BITS = 7;
private static final int ATAN2_BITS2 = ATAN2_BITS << 1;
private static final int ATAN2_MASK = ~(-1 << ATAN2_BITS2);
private static final int ATAN2_COUNT = ATAN2_MASK + 1;
private static final int ATAN2_DIM = (int) Math.sqrt(ATAN2_COUNT);
private static final float INV_ATAN2_DIM_MINUS_1 = 1.0f / (ATAN2_DIM - 1);
private static final float[] atan2 = new float[ATAN2_COUNT];
static {
for (int i = 0; i < ATAN2_DIM; i++) {
for (int j = 0; j < ATAN2_DIM; j++) {
float x0 = (float) i / ATAN2_DIM;
float y0 = (float) j / ATAN2_DIM;
atan2[(j * ATAN2_DIM) + i] = (float) Math.atan2(y0, x0);
}
}
}
public static double getMean(int[] array) {
double count = 0;
for (final int i : array) {
for (int i : array) {
count += i;
}
return count / array.length;
}
public static double getMean(final double[] array) {
public static double getMean(double[] array) {
double count = 0;
for (final double i : array) {
for (double i : array) {
count += i;
}
return count / array.length;
}
public static int pair(short x, short y) {
return (x << 16) | (y & 0xFFFF);
}
public static short unpairX(int hash) {
return (short) (hash >> 16);
}
public static short unpairY(int hash) {
return (short) (hash & 0xFFFF);
}
@ -35,15 +55,15 @@ public class MathMan {
* @param pitch
* @return
*/
public static float[] getDirection(final float yaw, final float pitch) {
final double pitch_sin = Math.sin(pitch);
return new float[] { (float) (pitch_sin * Math.cos(yaw)), (float) (pitch_sin * Math.sin(yaw)), (float) Math.cos(pitch) };
public static float[] getDirection(float yaw, float pitch) {
double pitch_sin = Math.sin(pitch);
return new float[]{(float) (pitch_sin * Math.cos(yaw)), (float) (pitch_sin * Math.sin(yaw)), (float) Math.cos(pitch)};
}
public static int roundInt(final double value) {
public static int roundInt(double value) {
return (int) (value < 0 ? (value == (int) value) ? value : value - 1 : value);
}
/**
* Returns [ pitch, yaw ]
* @param x
@ -51,47 +71,25 @@ public class MathMan {
* @param z
* @return
*/
public static float[] getPitchAndYaw(final float x, final float y, final float z) {
final float distance = sqrtApprox((z * z) + (x * x));
return new float[] { atan2(y, distance), atan2(x, z) };
public static float[] getPitchAndYaw(float x, float y, float z) {
float distance = sqrtApprox((z * z) + (x * x));
return new float[]{atan2(y, distance), atan2(x, z)};
}
private static final int ATAN2_BITS = 7;
private static final int ATAN2_BITS2 = ATAN2_BITS << 1;
private static final int ATAN2_MASK = ~(-1 << ATAN2_BITS2);
private static final int ATAN2_COUNT = ATAN2_MASK + 1;
private static final int ATAN2_DIM = (int) Math.sqrt(ATAN2_COUNT);
private static final float INV_ATAN2_DIM_MINUS_1 = 1.0f / (ATAN2_DIM - 1);
private static final float[] atan2 = new float[ATAN2_COUNT];
static {
for (int i = 0; i < ATAN2_DIM; i++) {
for (int j = 0; j < ATAN2_DIM; j++) {
final float x0 = (float) i / ATAN2_DIM;
final float y0 = (float) j / ATAN2_DIM;
atan2[(j * ATAN2_DIM) + i] = (float) Math.atan2(y0, x0);
}
}
}
public static final float atan2(float y, float x) {
float add, mul;
if (x < 0.0f) {
if (y < 0.0f) {
x = -x;
y = -y;
mul = 1.0f;
} else {
x = -x;
mul = -1.0f;
}
add = -3.141592653f;
} else {
if (y < 0.0f) {
@ -100,47 +98,47 @@ public class MathMan {
} else {
mul = 1.0f;
}
add = 0.0f;
}
final float invDiv = 1.0f / (((x < y) ? y : x) * INV_ATAN2_DIM_MINUS_1);
final int xi = (int) (x * invDiv);
final int yi = (int) (y * invDiv);
float invDiv = 1.0f / (((x < y) ? y : x) * INV_ATAN2_DIM_MINUS_1);
int xi = (int) (x * invDiv);
int yi = (int) (y * invDiv);
return (atan2[(yi * ATAN2_DIM) + xi] + add) * mul;
}
public static float sqrtApprox(final float f) {
public static float sqrtApprox(float f) {
return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
}
public static double sqrtApprox(final double d) {
public static double sqrtApprox(double d) {
return Double.longBitsToDouble(((Double.doubleToLongBits(d) - (1l << 52)) >> 1) + (1l << 61));
}
public static float invSqrt(float x) {
final float xhalf = 0.5f * x;
float xhalf = 0.5f * x;
int i = Float.floatToIntBits(x);
i = 0x5f3759df - (i >> 1);
x = Float.intBitsToFloat(i);
x = x * (1.5f - (xhalf * x * x));
return x;
}
public static int getPositiveId(final int i) {
public static int getPositiveId(int i) {
if (i < 0) {
return (-i * 2) - 1;
}
return i * 2;
}
public static boolean isInteger(final String str) {
public static boolean isInteger(String str) {
if (str == null) {
return false;
}
final int length = str.length();
int length = str.length();
if (length == 0) {
return false;
}
@ -152,45 +150,45 @@ public class MathMan {
i = 1;
}
for (; i < length; i++) {
final char c = str.charAt(i);
char c = str.charAt(i);
if ((c <= '/') || (c >= ':')) {
return false;
}
}
return true;
}
public static double getSD(final double[] array, final double av) {
public static double getSD(double[] array, double av) {
double sd = 0;
for (final double element : array) {
for (double element : array) {
sd += Math.pow(Math.abs(element - av), 2);
}
return Math.sqrt(sd / array.length);
}
public static double getSD(final int[] array, final double av) {
public static double getSD(int[] array, double av) {
double sd = 0;
for (final int element : array) {
for (int element : array) {
sd += Math.pow(Math.abs(element - av), 2);
}
return Math.sqrt(sd / array.length);
}
public static int mod(final int x, final int y) {
public static int mod(int x, int y) {
if (isPowerOfTwo(y)) {
return x & (y - 1);
}
return x % y;
}
public static int unsignedmod(final int x, final int y) {
public static int unsignedmod(int x, int y) {
if (isPowerOfTwo(y)) {
return x & (y - 1);
}
return x % y;
}
public static boolean isPowerOfTwo(final int x) {
public static boolean isPowerOfTwo(int x) {
return (x & (x - 1)) == 0;
}
}

18
Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
View File

@ -162,10 +162,10 @@ public abstract class SchematicHandler {
}
}
Dimension demensions = schematic.getSchematicDimension();
final int WIDTH = demensions.getX();
final int LENGTH = demensions.getZ();
final int HEIGHT = demensions.getY();
Dimension dimension = schematic.getSchematicDimension();
final int WIDTH = dimension.getX();
final int LENGTH = dimension.getZ();
final int HEIGHT = dimension.getY();
// Validate dimensions
RegionWrapper region = plot.getLargestRegion();
if (((region.maxX - region.minX + xOffset + 1) < WIDTH) || ((region.maxZ - region.minZ + zOffset + 1) < LENGTH) || (HEIGHT
@ -468,8 +468,8 @@ public abstract class SchematicHandler {
}
return schem;
}
public abstract void restoreTag(CompoundTag ct, short x, short y, short z, Schematic schem);
public abstract void restoreTag(CompoundTag ct, short x, short y, short z, Schematic schematic);
/**
* Get a schematic
@ -616,11 +616,11 @@ public abstract class SchematicHandler {
* Create a compound tag from blocks
* - Untested
* @param blocks
* @param blockdata
* @param blockData
* @param dimension
* @return
*/
public CompoundTag createTag(byte[] blocks, byte[] blockdata, Dimension dimension) {
public CompoundTag createTag(byte[] blocks, byte[] blockData, Dimension dimension) {
HashMap<String, Tag> schematic = new HashMap<>();
schematic.put("Width", new ShortTag("Width", (short) dimension.getX()));
schematic.put("Length", new ShortTag("Length", (short) dimension.getZ()));
@ -633,7 +633,7 @@ public abstract class SchematicHandler {
schematic.put("WEOffsetY", new IntTag("WEOffsetY", 0));
schematic.put("WEOffsetZ", new IntTag("WEOffsetZ", 0));
schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
schematic.put("Data", new ByteArrayTag("Data", blockdata));
schematic.put("Data", new ByteArrayTag("Data", blockData));
schematic.put("Entities", new ListTag("Entities", CompoundTag.class, new ArrayList<Tag>()));
schematic.put("TileEntities", new ListTag("TileEntities", CompoundTag.class, new ArrayList<Tag>()));
return new CompoundTag("Schematic", schematic);

30
Core/src/main/java/com/intellectualcrafters/plot/util/StringMan.java
View File

@ -42,21 +42,6 @@ public class StringMan {
return count;
}
public Collection match(Collection col, String startsWith) {
if (col == null) {
return null;
}
startsWith = startsWith.toLowerCase();
Iterator iter = col.iterator();
while (iter.hasNext()) {
Object item = iter.next();
if (item == null || !item.toString().toLowerCase().startsWith(startsWith)) {
iter.remove();
}
}
return col;
}
public static String getString(Object obj) {
if (obj == null) {
return "null";
@ -279,4 +264,19 @@ public class StringMan {
}
return sb.toString();
}
public Collection match(Collection col, String startsWith) {
if (col == null) {
return null;
}
startsWith = startsWith.toLowerCase();
Iterator iterator = col.iterator();
while (iterator.hasNext()) {
Object item = iterator.next();
if (item == null || !item.toString().toLowerCase().startsWith(startsWith)) {
iterator.remove();
}
}
return col;
}
}

6
Core/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java
View File

@ -88,14 +88,14 @@ public abstract class TaskManager {
* @param whenDone
*/
public static <T> void objectTask(Collection<T> objects, final RunnableVal<T> task, final Runnable whenDone) {
final Iterator<T> iter = objects.iterator();
final Iterator<T> iterator = objects.iterator();
TaskManager.runTask(new Runnable() {
@Override
public void run() {
long start = System.currentTimeMillis();
boolean hasNext;
while ((hasNext = iter.hasNext()) && System.currentTimeMillis() - start < 5) {
task.value = iter.next();
while ((hasNext = iterator.hasNext()) && System.currentTimeMillis() - start < 5) {
task.value = iterator.next();
task.run();
}
if (!hasNext) {

2
Core/src/main/java/com/intellectualcrafters/plot/util/WorldUtil.java
View File

@ -26,7 +26,7 @@ public abstract class WorldUtil {
public abstract String getMainWorld();
public abstract boolean isWorld(String worldname);
public abstract boolean isWorld(String worldName);
public abstract String[] getSign(Location location);

61
Core/src/main/java/com/plotsquared/general/commands/Command.java
View File

@ -14,6 +14,7 @@ import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.StringComparison;
import com.intellectualcrafters.plot.util.StringMan;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
@ -101,8 +102,8 @@ public abstract class Command {
}
public String getFullId() {
if (parent != null && parent.getParent() != null) {
return parent.getFullId() + "." + id;
if (this.parent != null && this.parent.getParent() != null) {
return this.parent.getFullId() + "." + this.id;
}
return this.id;
}
@ -118,16 +119,16 @@ public abstract class Command {
}
public List<Command> getCommands(CommandCategory cat, PlotPlayer player) {
List<Command> cmds = getCommands(player);
List<Command> commands = getCommands(player);
if (cat != null) {
Iterator<Command> iter = cmds.iterator();
while (iter.hasNext()) {
if (iter.next().category != cat) {
iter.remove();
Iterator<Command> iterator = commands.iterator();
while (iterator.hasNext()) {
if (iterator.next().category != cat) {
iterator.remove();
}
}
}
return cmds;
return commands;
}
public List<Command> getCommands() {
@ -301,29 +302,27 @@ public abstract class Command {
}
// Command recommendation
MainUtil.sendMessage(player, C.NOT_VALID_SUBCOMMAND);
{
List<Command> cmds = getCommands(player);
if (cmds.isEmpty()) {
MainUtil.sendMessage(player, C.DID_YOU_MEAN, MainCommand.getInstance().help.getUsage());
return;
}
HashSet<String> setargs = new HashSet<>(args.length);
for (String arg : args) {
setargs.add(arg.toLowerCase());
}
String[] allargs = setargs.toArray(new String[setargs.size()]);
int best = 0;
for (Command current : cmds) {
int match = getMatch(allargs, current);
if (match > best) {
cmd = current;
}
}
if (cmd == null) {
cmd = new StringComparison<>(args[0], this.allCommands).getMatchObject();
}
MainUtil.sendMessage(player, C.DID_YOU_MEAN, cmd.getUsage());
List<Command> commands = getCommands(player);
if (commands.isEmpty()) {
MainUtil.sendMessage(player, C.DID_YOU_MEAN, MainCommand.getInstance().help.getUsage());
return;
}
HashSet<String> setargs = new HashSet<>(args.length);
for (String arg : args) {
setargs.add(arg.toLowerCase());
}
String[] allargs = setargs.toArray(new String[setargs.size()]);
int best = 0;
for (Command current : commands) {
int match = getMatch(allargs, current);
if (match > best) {
cmd = current;
}
}
if (cmd == null) {
cmd = new StringComparison<>(args[0], this.allCommands).getMatchObject();
}
MainUtil.sendMessage(player, C.DID_YOU_MEAN, cmd.getUsage());
return;
}
String[] newArgs = Arrays.copyOfRange(args, 1, args.length);
@ -335,7 +334,7 @@ public abstract class Command {
public boolean checkArgs(PlotPlayer player, String[] args) {
Argument<?>[] reqArgs = getRequiredArguments();
if ((reqArgs != null) && (reqArgs.length > 0)) {
if (reqArgs != null && reqArgs.length > 0) {
boolean failed = args.length < reqArgs.length;
String[] baseSplit = getCommandString().split(" ");
String[] fullSplit = getUsage().split(" ");

17
Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
View File

@ -13,6 +13,7 @@ import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.NullExtent;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.biome.BaseBiome;
@ -81,7 +82,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
case 29:
case 33:
case 151:
case 178: {
case 178:
if (this.BSblocked) {
return false;
}
@ -96,7 +97,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
try {
Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
field.setAccessible(true);
field.set(this.parent, new com.sk89q.worldedit.extent.NullExtent());
field.set(this.parent, new NullExtent());
} catch (Exception e) {
e.printStackTrace();
}
@ -107,8 +108,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
return super.setBlock(location, block);
}
break;
}
default: {
default:
int x = location.getBlockX();
int y = location.getBlockY();
int z = location.getBlockZ();
@ -118,7 +118,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
try {
Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
field.setAccessible(true);
field.set(this.parent, new com.sk89q.worldedit.extent.NullExtent());
field.set(this.parent, new NullExtent());
} catch (Exception e) {
e.printStackTrace();
}
@ -208,26 +208,23 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
case 189:
case 190:
case 191:
case 192: {
case 192:
if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT) {
SetQueue.IMP.setBlock(this.world, x, y, z, id);
} else {
super.setBlock(location, block);
}
break;
}
default: {
default:
if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT) {
SetQueue.IMP.setBlock(this.world, x, y, z, new PlotBlock((short) id, (byte) block.getData()));
} else {
super.setBlock(location, block);
}
break;
}
}
return true;
}
}
}
return false;