mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-23 05:36:45 +01:00
Don't use streams as they're lower performance for our use cases.
Some minor reformating too.
This commit is contained in:
parent
d0a4465985
commit
350e151214
@ -154,7 +154,8 @@ public class NbtFactory {
|
|||||||
* @return The decoded NBT compound.
|
* @return The decoded NBT compound.
|
||||||
* @throws IOException If anything went wrong.
|
* @throws IOException If anything went wrong.
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings({"IOResourceOpenedButNotSafelyClosed", "resource"}) public static NbtCompound fromStream(InputStream input, StreamOptions option)
|
@SuppressWarnings({"IOResourceOpenedButNotSafelyClosed", "resource"})
|
||||||
|
public static NbtCompound fromStream(InputStream input, StreamOptions option)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
DataInputStream data = null;
|
DataInputStream data = null;
|
||||||
boolean suppress = true;
|
boolean suppress = true;
|
||||||
@ -527,7 +528,9 @@ public class NbtFactory {
|
|||||||
*
|
*
|
||||||
* @author Kristian
|
* @author Kristian
|
||||||
*/
|
*/
|
||||||
public enum StreamOptions {NO_COMPRESSION, GZIP_COMPRESSION,}
|
public enum StreamOptions {
|
||||||
|
NO_COMPRESSION, GZIP_COMPRESSION,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private enum NbtType {
|
private enum NbtType {
|
||||||
|
@ -2,8 +2,6 @@ package com.github.intellectualsites.plotsquared.commands;
|
|||||||
|
|
||||||
import com.github.intellectualsites.plotsquared.plot.object.PlotId;
|
import com.github.intellectualsites.plotsquared.plot.object.PlotId;
|
||||||
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
public abstract class Argument<T> {
|
public abstract class Argument<T> {
|
||||||
|
|
||||||
public static final Argument<Integer> Integer = new Argument<Integer>("int", 16) {
|
public static final Argument<Integer> Integer = new Argument<Integer>("int", 16) {
|
||||||
@ -19,9 +17,11 @@ public abstract class Argument<T> {
|
|||||||
public static final Argument<Boolean> Boolean = new Argument<Boolean>("boolean", true) {
|
public static final Argument<Boolean> Boolean = new Argument<Boolean>("boolean", true) {
|
||||||
@Override public Boolean parse(String in) {
|
@Override public Boolean parse(String in) {
|
||||||
Boolean value = null;
|
Boolean value = null;
|
||||||
if (Stream.of("true", "Yes", "1").anyMatch(in::equalsIgnoreCase)) {
|
if (in.equalsIgnoreCase("true") || in.equalsIgnoreCase("Yes") || in
|
||||||
|
.equalsIgnoreCase("1")) {
|
||||||
value = true;
|
value = true;
|
||||||
} else if (Stream.of("false", "No", "0").anyMatch(in::equalsIgnoreCase)) {
|
} else if (in.equalsIgnoreCase("false") || in.equalsIgnoreCase("No") || in
|
||||||
|
.equalsIgnoreCase("0")) {
|
||||||
value = false;
|
value = false;
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
|
@ -9,7 +9,6 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
|
|||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
@CommandDeclaration(command = "setowner", permission = "plots.set.owner",
|
@CommandDeclaration(command = "setowner", permission = "plots.set.owner",
|
||||||
description = "Set the plot owner", usage = "/plot setowner <player>",
|
description = "Set the plot owner", usage = "/plot setowner <player>",
|
||||||
@ -32,7 +31,8 @@ import java.util.stream.Stream;
|
|||||||
name = name == null ? value : name;
|
name = name == null ? value : name;
|
||||||
}
|
}
|
||||||
if (uuid == null || value.equalsIgnoreCase("-")) {
|
if (uuid == null || value.equalsIgnoreCase("-")) {
|
||||||
if (Stream.of("none", "null", "-").anyMatch(value::equalsIgnoreCase)) {
|
if (value.equalsIgnoreCase("none") || value.equalsIgnoreCase("null") || value
|
||||||
|
.equalsIgnoreCase("-")) {
|
||||||
if (!Permissions
|
if (!Permissions
|
||||||
.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
|
.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -3,8 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.object;
|
|||||||
public enum Direction {
|
public enum Direction {
|
||||||
NORTH(0, "north"), EAST(1, "east"), SOUTH(2, "south"), WEST(3, "west"), NORTHEAST(4,
|
NORTH(0, "north"), EAST(1, "east"), SOUTH(2, "south"), WEST(3, "west"), NORTHEAST(4,
|
||||||
"northeast"), SOUTHEAST(5, "southeast"), SOUTHWEST(6, "southwest"), NORTHWEST(7,
|
"northeast"), SOUTHEAST(5, "southeast"), SOUTHWEST(6, "southwest"), NORTHWEST(7,
|
||||||
"northwest"),
|
"northwest"),;
|
||||||
;
|
|
||||||
|
|
||||||
|
|
||||||
private int index;
|
private int index;
|
||||||
|
@ -33,7 +33,6 @@ import java.util.*;
|
|||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.IntStream;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The plot class<br>
|
* The plot class<br>
|
||||||
@ -516,7 +515,8 @@ public class Plot {
|
|||||||
* @return true if this plot is merged, otherwise false
|
* @return true if this plot is merged, otherwise false
|
||||||
*/
|
*/
|
||||||
public boolean isMerged() {
|
public boolean isMerged() {
|
||||||
return IntStream.of(0, 2, 1, 3).anyMatch(i -> getSettings().getMerged(i));
|
return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
|
||||||
|
.getMerged(1) || getSettings().getMerged(3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -5,7 +5,9 @@ import java.util.Arrays;
|
|||||||
public class ArrayUtil {
|
public class ArrayUtil {
|
||||||
public static final <T> T[] concatAll(T[] first, T[]... rest) {
|
public static final <T> T[] concatAll(T[] first, T[]... rest) {
|
||||||
int totalLength = first.length;
|
int totalLength = first.length;
|
||||||
totalLength += Arrays.stream(rest).mapToInt(array -> array.length).sum();
|
for (T[] array : rest) {
|
||||||
|
totalLength += array.length;
|
||||||
|
}
|
||||||
T[] result = Arrays.copyOf(first, totalLength);
|
T[] result = Arrays.copyOf(first, totalLength);
|
||||||
int offset = first.length;
|
int offset = first.length;
|
||||||
for (T[] array : rest) {
|
for (T[] array : rest) {
|
||||||
|
Loading…
Reference in New Issue
Block a user