Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-01 02:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Jesse Boyd
2019-07-22 16:39:43 +10:00
parent 07283af614 9c3122a227
commit 283351fea5
56 changed files with 1202 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
worldedit-core/src/main/java/com/boydti/fawe/util/Perm.java
View File

@ -11,21 +11,21 @@ public enum Perm {
public String s;
public String cat;
Perm(final String perm, final String cat) {
Perm(String perm, String cat) {
this.s = perm;
this.cat = cat;
}
public boolean has(final FawePlayer<?> player) {
public boolean has(FawePlayer<?> player) {
return this.hasPermission(player, this);
}
public boolean hasPermission(final FawePlayer<?> player, final Perm perm) {
public boolean hasPermission(FawePlayer<?> player, Perm perm) {
return hasPermission(player, perm.s);
}
public static boolean hasPermission(final FawePlayer<?> player, final String perm) {
if ((player == null) || player.hasPermission(ADMIN.s)) {
public static boolean hasPermission(FawePlayer<?> player, String perm) {
if (player == null || player.hasPermission(ADMIN.s)) {
return true;
}
if (player.hasPermission(perm)) {
@ -33,8 +33,8 @@ public enum Perm {
}
final String[] nodes = perm.split("\\.");
final StringBuilder n = new StringBuilder();
for (int i = 0; i < (nodes.length - 1); i++) {
n.append(nodes[i] + ("."));
for (int i = 0; i < nodes.length - 1; i++) {
n.append(nodes[i]).append(".");
if (player.hasPermission(n + "*")) {
return true;
}

2
worldedit-core/src/main/java/com/boydti/fawe/util/RandomTextureUtil.java
View File

@ -32,7 +32,7 @@ public class RandomTextureUtil extends CachedTextureUtil {
private int random(int i) {
if (i < 0) {
int i1 = (-i);
int i1 = -i;
return -ThreadLocalRandom.current().nextInt(i1);
} else {
return ThreadLocalRandom.current().nextInt(i);

98
worldedit-core/src/main/java/com/boydti/fawe/util/StringMan.java
View File

@ -1,7 +1,5 @@
package com.boydti.fawe.util;
import com.sk89q.util.StringUtil;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
@ -10,17 +8,17 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.function.IntConsumer;
import java.util.function.IntFunction;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
public class StringMan {
public static String replaceFromMap(final String string, final Map<String, String> replacements) {
public static String replaceFromMap(String string, Map<String, String> replacements) {
final StringBuilder sb = new StringBuilder(string);
int size = string.length();
for (final Entry<String, String> entry : replacements.entrySet()) {
for (Entry<String, String> entry : replacements.entrySet()) {
if (size == 0) {
break;
}
@ -122,7 +120,6 @@ public class StringMan {
boolean neg = false;
int numIndex = 1;
int len = string.length();
outer:
for (int i = len - 1; i >= 0; i--) {
char c = string.charAt(i);
switch (c) {
@ -138,10 +135,10 @@ public class StringMan {
return val;
}
public static String removeFromSet(final String string, final Collection<String> replacements) {
public static String removeFromSet(String string, Collection<String> replacements) {
final StringBuilder sb = new StringBuilder(string);
int size = string.length();
for (final String key : replacements) {
for (String key : replacements) {
if (size == 0) {
break;
}
@ -178,8 +175,9 @@ public class StringMan {
boolean inQuotes = false;
for (int current = 0; current < input.length(); current++) {
char currentChar = input.charAt(current);
boolean atLastChar = (current == input.length() - 1);
if (!atLastChar && (bracket > 0 || (currentChar == '{' && ++bracket > 0) || (current == '}' && --bracket <= 0)))
boolean atLastChar = current == input.length() - 1;
if (!atLastChar && (bracket > 0 || currentChar == '{' && ++bracket > 0
|| current == '}' && --bracket <= 0))
continue;
if (currentChar == '\"') inQuotes = !inQuotes; // toggle state
if (atLastChar) result.add(input.substring(start));
@ -195,9 +193,9 @@ public class StringMan {
return result;
}
public static int intersection(final Set<String> options, final String[] toCheck) {
public static int intersection(Set<String> options, String[] toCheck) {
int count = 0;
for (final String check : toCheck) {
for (String check : toCheck) {
if (options.contains(check)) {
count++;
}
@ -213,7 +211,7 @@ public class StringMan {
return String.format("%1$" + n + "s", s);
}
public static String getString(final Object obj) {
public static String getString(Object obj) {
if (obj == null) {
return "null";
}
@ -221,18 +219,18 @@ public class StringMan {
return (String) obj;
}
if (obj.getClass().isArray()) {
String result = "";
StringBuilder result = new StringBuilder();
String prefix = "";
for (int i = 0; i < Array.getLength(obj); i++) {
result += prefix + getString(Array.get(obj, i));
result.append(prefix).append(getString(Array.get(obj, i)));
prefix = ",";
}
return "{ " + result + " }";
} else if (obj instanceof Collection<?>) {
StringBuilder result = new StringBuilder();
String prefix = "";
for (final Object element : (Collection<?>) obj) {
for (Object element : (Collection<?>) obj) {
result.append(prefix).append(getString(element));
prefix = ",";
}
@ -242,7 +240,7 @@ public class StringMan {
}
}
public static String replaceFirst(final char c, final String s) {
public static String replaceFirst(char c, String s) {
if (s == null) {
return "";
}
@ -253,8 +251,8 @@ public class StringMan {
final char[] newChars = new char[chars.length];
int used = 0;
boolean found = false;
for (final char cc : chars) {
if (!found && (c == cc)) {
for (char cc : chars) {
if (!found && c == cc) {
found = true;
} else {
newChars[used++] = cc;
@ -268,7 +266,7 @@ public class StringMan {
return s;
}
public static String replaceAll(final String string, final Object... pairs) {
public static String replaceAll(String string, Object... pairs) {
final StringBuilder sb = new StringBuilder(string);
for (int i = 0; i < pairs.length; i += 2) {
final String key = pairs[i] + "";
@ -284,56 +282,57 @@ public class StringMan {
return sb.toString();
}
public static boolean isAlphanumeric(final String str) {
public static boolean isAlphanumeric(String str) {
for (int i = 0; i < str.length(); i++) {
final char c = str.charAt(i);
if ((c < 0x30) || ((c >= 0x3a) && (c <= 0x40)) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a)) {
if (c < 0x30 || c >= 0x3a && c <= 0x40 || c > 0x5a && c <= 0x60 ||
c > 0x7a) {
return false;
}
}
return true;
}
public static boolean isAlphanumericUnd(final CharSequence str) {
public static boolean isAlphanumericUnd(CharSequence str) {
for (int i = 0; i < str.length(); i++) {
final char c = str.charAt(i);
if ((c < 0x30) || ((c >= 0x3a) && (c <= 0x40)) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a) || (c == '_')) {
if (c < 0x30 || c >= 0x3a && c <= 0x40 || c > 0x5a && c <= 0x60 || c > 0x7a) {
return false;
}
}
return true;
}
public static boolean isAlpha(final String str) {
public static boolean isAlpha(String str) {
for (int i = 0; i < str.length(); i++) {
final char c = str.charAt(i);
if ((c <= 0x40) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a)) {
if (c <= 0x40 || c > 0x5a && c <= 0x60 || c > 0x7a) {
return false;
}
}
return true;
}
public static String join(final Collection<?> collection, final String delimiter) {
public static String join(Collection<?> collection, String delimiter) {
return join(collection.toArray(), delimiter);
}
public static String joinOrdered(final Collection<?> collection, final String delimiter) {
public static String joinOrdered(Collection<?> collection, String delimiter) {
final Object[] array = collection.toArray();
Arrays.sort(array, Comparator.comparingInt(Object::hashCode));
return join(array, delimiter);
}
public static String join(final Collection<?> collection, final char delimiter) {
public static String join(Collection<?> collection, char delimiter) {
return join(collection.toArray(), delimiter + "");
}
public static boolean isAsciiPrintable(final char c) {
return (c >= ' ') && (c < '');
public static boolean isAsciiPrintable(char c) {
return c >= ' ' && c < '';
}
public static boolean isAsciiPrintable(final String s) {
for (final char c : s.toCharArray()) {
public static boolean isAsciiPrintable(String s) {
for (char c : s.toCharArray()) {
if (!isAsciiPrintable(c)) {
return false;
}
@ -427,7 +426,7 @@ public class StringMan {
return p[n];
}
public static <T> String join(Collection<T> arr, final String delimiter, Function<T, String> funx) {
public static <T> String join(Collection<T> arr, String delimiter, Function<T, String> funx) {
final StringBuilder result = new StringBuilder();
int i = 0;
for (T obj : arr) {
@ -440,7 +439,7 @@ public class StringMan {
return result.toString();
}
public static String join(final Object[] array, final String delimiter) {
public static String join(Object[] array, String delimiter) {
switch (array.length) {
case 0:
return "";
@ -489,16 +488,13 @@ public class StringMan {
return negative ? -value : value;
}
public static String join(final int[] array, final String delimiter) {
final Integer[] wrapped = new Integer[array.length];
for (int i = 0; i < array.length; i++) {
wrapped[i] = array[i];
}
public static String join(int[] array, String delimiter) {
final Integer[] wrapped = Arrays.stream(array).boxed().toArray(Integer[]::new);
return join(wrapped, delimiter);
}
public static boolean isEqualToAny(final String a, final String... args) {
for (final String arg : args) {
public static boolean isEqualToAny(String a, String... args) {
for (String arg : args) {
if (StringMan.isEqual(a, arg)) {
return true;
}
@ -506,8 +502,8 @@ public class StringMan {
return false;
}
public static boolean isEqualIgnoreCaseToAny(final String a, final String... args) {
for (final String arg : args) {
public static boolean isEqualIgnoreCaseToAny(String a, String... args) {
for (String arg : args) {
if (StringMan.isEqualIgnoreCase(a, arg)) {
return true;
}
@ -515,15 +511,17 @@ public class StringMan {
return false;
}
public static boolean isEqual(final String a, final String b) {
return ((a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && (a.hashCode() == b.hashCode()) && a.equals(b)));
public static boolean isEqual(String a, String b) {
return a == b || a != null && b != null && a.length() == b.length()
&& a.hashCode() == b.hashCode()
&& a.equals(b);
}
public static boolean isEqualIgnoreCase(final String a, final String b) {
public static boolean isEqualIgnoreCase(String a, String b) {
return ((a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && a.equalsIgnoreCase(b)));
}
public static String repeat(final String s, final int n) {
public static String repeat(String s, int n) {
final StringBuilder sb = new StringBuilder();
for (int i = 0; i < n; i++) {
sb.append(s);

4
worldedit-core/src/main/java/com/boydti/fawe/util/TaskManager.java
View File

@ -258,12 +258,12 @@ public abstract class TaskManager {
});
}
public void wait(AtomicBoolean running, int timout) {
public void wait(AtomicBoolean running, int timeout) {
try {
long start = System.currentTimeMillis();
synchronized (running) {
while (running.get()) {
running.wait(timout);
running.wait(timeout);
if (running.get() && System.currentTimeMillis() - start > Settings.IMP.QUEUE.DISCARD_AFTER_MS) {
new RuntimeException("FAWE is taking a long time to execute a task (might just be a symptom): ").printStackTrace();
Fawe.debug("For full debug information use: /fawe threads");

30
worldedit-core/src/main/java/com/boydti/fawe/util/image/ImageUtil.java
View File

@ -1,10 +1,10 @@
package com.boydti.fawe.util.image;
import com.boydti.fawe.Fawe;
import com.boydti.fawe.command.FawePrimitiveBinding;
import com.boydti.fawe.util.MainUtil;
import com.boydti.fawe.util.MathMan;
import com.sk89q.worldedit.util.command.parametric.ParameterException;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.platform.binding.ProvideBindings;
import javax.annotation.Nullable;
import java.awt.Graphics2D;
@ -161,19 +161,19 @@ public class ImageUtil {
return (alpha << 24) + (red << 16) + (green << 8) + (blue << 0);
}
public static BufferedImage load(@Nullable FawePrimitiveBinding.ImageUri uri) throws ParameterException {
public static BufferedImage load(@Nullable ProvideBindings.ImageUri uri) throws InputParseException {
return uri == null ? null : uri.load();
}
public static BufferedImage load(URI uri) throws ParameterException {
public static BufferedImage load(URI uri) throws InputParseException {
try {
return MainUtil.readImage(getInputStream(uri));
} catch (IOException e) {
throw new ParameterException(e);
throw new InputParseException(e.getMessage());
}
}
public static InputStream getInputStream(URI uri) throws ParameterException {
public static InputStream getInputStream(URI uri) throws InputParseException {
try {
String uriStr = uri.toString();
if (uriStr.startsWith("file:/")) {
@ -182,11 +182,11 @@ public class ImageUtil {
}
return new URL(uriStr).openStream();
} catch (IOException e) {
throw new ParameterException(e);
throw new InputParseException(e.getMessage());
}
}
public static BufferedImage getImage(String arg) throws ParameterException {
public static BufferedImage getImage(String arg) throws InputParseException {
try {
if (arg.startsWith("http")) {
if (arg.contains("imgur.com") && !arg.contains("i.imgur.com")) {
@ -203,14 +203,14 @@ public class ImageUtil {
File file = MainUtil.getFile(MainUtil.getFile(Fawe.imp().getDirectory(), com.boydti.fawe.config.Settings.IMP.PATHS.HEIGHTMAP), arg);
return MainUtil.readImage(file);
} else {
throw new ParameterException("Invalid image " + arg);
throw new InputParseException("Invalid image " + arg);
}
} catch (IOException e) {
throw new ParameterException(e);
throw new InputParseException(e.getMessage());
}
}
public static URI getImageURI(String arg) throws ParameterException {
public static URI getImageURI(String arg) throws InputParseException {
try {
if (arg.startsWith("http")) {
if (arg.contains("imgur.com") && !arg.contains("i.imgur.com")) {
@ -221,17 +221,17 @@ public class ImageUtil {
arg = arg.replaceFirst("file:/+", "");
File file = MainUtil.getFile(MainUtil.getFile(Fawe.imp().getDirectory(), com.boydti.fawe.config.Settings.IMP.PATHS.HEIGHTMAP), arg);
if (!file.exists()) {
throw new ParameterException("File not found " + file);
throw new InputParseException("File not found " + file);
}
if (file.isDirectory()) {
throw new ParameterException("File is a directory " + file);
throw new InputParseException("File is a directory " + file);
}
return file.toURI();
} else {
throw new ParameterException("Invalid image " + arg);
throw new InputParseException("Invalid image " + arg);
}
} catch (IOException | URISyntaxException e) {
throw new ParameterException(e);
throw new InputParseException(e.getMessage());
}
}
}