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

Part 1 of upstream merge and format

Browse Source
This commit is contained in:
MattBDev
2020-07-13 22:50:59 -04:00
parent 79771e83e0
commit 3bc692ff11
576 changed files with 3979 additions and 3421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
worldedit-core/src/main/java/com/sk89q/worldedit/util/Direction.java
View File

@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.OptionalInt;
import javax.annotation.Nullable;
/**

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/Enums.java
View File

@ -19,10 +19,10 @@
package com.sk89q.worldedit.util;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Helper methods for enums.
*/

1
worldedit-core/src/main/java/com/sk89q/worldedit/util/FileDialogUtil.java
View File

@ -25,7 +25,6 @@ import java.io.File;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/GuavaUtil.java
View File

@ -19,10 +19,10 @@
package com.sk89q.worldedit.util;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
public final class GuavaUtil {
private GuavaUtil() {}

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/LocatedBlock.java
View File

@ -19,13 +19,13 @@
package com.sk89q.worldedit.util;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BaseBlock;
import java.util.Objects;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Represents a block located at some position.
*/

6
worldedit-core/src/main/java/com/sk89q/worldedit/util/Location.java
View File

@ -19,13 +19,13 @@
package com.sk89q.worldedit.util;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.math.Vector3Impl;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Represents a location in a world with has a direction.
*

6
worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java
View File

@ -26,8 +26,6 @@ import com.sk89q.worldedit.LocalConfiguration;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.util.report.Unreported;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import com.sk89q.worldedit.world.snapshot.SnapshotRepository;
import com.sk89q.worldedit.world.snapshot.experimental.fs.FileSystemSnapshotDatabase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -38,10 +36,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Properties;

1
worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java
View File

@ -26,7 +26,6 @@ import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.mask.SolidBlockMask;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.world.World;
import javax.annotation.Nullable;

1
worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java
View File

@ -35,7 +35,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import javax.annotation.Nullable;
/**

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/WeightedChoice.java
View File

@ -19,11 +19,11 @@
package com.sk89q.worldedit.util;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Optional;
import java.util.function.Function;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Returns the best choice given a weighting function and a target weight.
*

1
worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java
View File

@ -25,7 +25,6 @@ import com.sk89q.worldedit.LocalConfiguration;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.session.SessionManager;
import com.sk89q.worldedit.util.report.Unreported;
import com.sk89q.worldedit.world.snapshot.SnapshotRepository;
import org.slf4j.Logger;
import java.io.IOException;

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/Int2BaseBlockMap.java
View File

@ -33,9 +33,9 @@ import it.unimi.dsi.fastutil.objects.AbstractObjectSet;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
import it.unimi.dsi.fastutil.objects.ObjectSet;
import javax.annotation.Nonnull;
import java.util.NoSuchElementException;
import java.util.function.BiFunction;
import javax.annotation.Nonnull;
/**
* Int-to-BaseBlock map, but with optimizations for common cases.

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/LocatedBlockList.java
View File

@ -26,9 +26,9 @@ import com.sk89q.worldedit.util.LocatedBlock;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Iterator;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;

11
worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/AnnotatedSubscriberFinder.java
View File

@ -35,8 +35,10 @@ class AnnotatedSubscriberFinder implements SubscriberFindingStrategy {
/**
* {@inheritDoc}
*
* <p>
* This implementation finds all methods marked with a {@link Subscribe}
* annotation.
* </p>
*/
@Override
public Multimap<Class<?>, EventHandler> findAllSubscribers(Object listener) {
@ -51,9 +53,10 @@ class AnnotatedSubscriberFinder implements SubscriberFindingStrategy {
Class<?>[] parameterTypes = method.getParameterTypes();
if (parameterTypes.length != 1) {
throw new IllegalArgumentException(
"Method " + method + " has @Subscribe annotation, but requires " +
parameterTypes.length + " arguments. Event handler methods " +
"must require a single argument.");
"Method " + method + " has @Subscribe annotation, but requires "
+ parameterTypes.length + " arguments. Event handler methods "
+ "must require a single argument."
);
}
Class<?> eventType = parameterTypes[0];
EventHandler handler = new MethodEventHandler(annotation.priority(), listener, method);
@ -66,4 +69,4 @@ class AnnotatedSubscriberFinder implements SubscriberFindingStrategy {
return methodsInListener;
}
}
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/EventHandler.java
View File

@ -19,10 +19,10 @@
package com.sk89q.worldedit.util.eventbus;
import static com.google.common.base.Preconditions.checkNotNull;
import java.lang.reflect.InvocationTargetException;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Event handler object for {@link EventBus} that is able to dispatch
* an event.

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/MethodEventHandler.java
View File

@ -19,10 +19,10 @@
package com.sk89q.worldedit.util.eventbus;
import static com.google.common.base.Preconditions.checkNotNull;
import java.lang.reflect.Method;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Invokes a {@link Method} to dispatch an event.
*/

6
worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/Subscribe.java
View File

@ -19,12 +19,12 @@
package com.sk89q.worldedit.util.eventbus;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* Used to mark methods as event handlers.
*/

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/CommandUsageBox.java
View File

@ -29,8 +29,8 @@ import org.enginehub.piston.CommandParameters;
import org.enginehub.piston.config.ColorConfig;
import org.enginehub.piston.util.HelpGenerator;
import javax.annotation.Nullable;
import java.util.List;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.worldedit.internal.command.CommandUtil.getSubCommands;

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/MessageBox.java
View File

@ -19,8 +19,6 @@
package com.sk89q.worldedit.util.formatting.component;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Strings;
import com.google.common.collect.Sets;
import com.sk89q.worldedit.util.formatting.text.Component;
@ -28,6 +26,8 @@ import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.format.TextColor;
import com.sk89q.worldedit.util.formatting.text.format.TextDecoration;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Makes for a box with a border above and below.
*/

6
worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/PaginationBox.java
View File

@ -19,23 +19,19 @@
package com.sk89q.worldedit.util.formatting.component;
import com.boydti.fawe.object.collection.AdaptedSetCollection;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
import com.sk89q.worldedit.util.formatting.text.event.HoverEvent;
import com.sk89q.worldedit.util.formatting.text.format.TextColor;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.function.Supplier;
import javax.annotation.Nullable;
public abstract class PaginationBox extends MessageBox {

5
worldedit-core/src/main/java/com/sk89q/worldedit/util/function/LevenshteinDistance.java
View File

@ -19,15 +19,14 @@
package com.sk89q.worldedit.util.function;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
import java.util.Locale;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Provides a Levenshtein distance between a given string and each string
* that this function is applied to.

1
worldedit-core/src/main/java/com/sk89q/worldedit/util/logging/DynamicStreamHandler.java
View File

@ -26,7 +26,6 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
import java.util.logging.StreamHandler;
import javax.annotation.Nullable;
/**

3
worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java
View File

@ -19,9 +19,8 @@
package com.sk89q.worldedit.util.paste;
import com.sk89q.worldedit.command.util.AsyncCommandBuilder;
import com.boydti.fawe.util.IncendoPaster;
import com.sk89q.worldedit.command.util.AsyncCommandBuilder;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;

6
worldedit-core/src/main/java/com/sk89q/worldedit/util/report/DataReport.java
View File

@ -22,7 +22,11 @@ package com.sk89q.worldedit.util.report;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static com.google.common.base.Preconditions.checkNotNull;

8
worldedit-core/src/main/java/com/sk89q/worldedit/util/report/SystemInfoReport.java
View File

@ -19,7 +19,13 @@
package com.sk89q.worldedit.util.report;
import java.lang.management.*;
import java.lang.management.ClassLoadingMXBean;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
import java.lang.management.RuntimeMXBean;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
import java.util.List;
import java.util.concurrent.TimeUnit;

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/task/AbstractTask.java
View File

@ -21,9 +21,9 @@ package com.sk89q.worldedit.util.task;
import com.google.common.util.concurrent.AbstractFuture;
import javax.annotation.Nullable;
import java.util.Date;
import java.util.UUID;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/task/FutureForwardingTask.java
View File

@ -22,11 +22,11 @@ package com.sk89q.worldedit.util.task;
import com.google.common.util.concurrent.ListenableFuture;
import com.sk89q.worldedit.util.task.progress.Progress;
import javax.annotation.Nullable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/task/Task.java
View File

@ -22,9 +22,9 @@ package com.sk89q.worldedit.util.task;
import com.google.common.util.concurrent.ListenableFuture;
import com.sk89q.worldedit.util.task.progress.ProgressObservable;
import javax.annotation.Nullable;
import java.util.Date;
import java.util.UUID;
import javax.annotation.Nullable;
/**
* A task is a job that can be scheduled, run, or cancelled. Tasks can report

4
worldedit-core/src/main/java/com/sk89q/worldedit/util/time/FileNameDateTimeParser.java
View File

@ -20,17 +20,15 @@
package com.sk89q.worldedit.util.time;
import com.google.common.collect.Streams;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.util.io.file.MorePaths;
import javax.annotation.Nullable;
import java.nio.file.Path;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
/**
* Parses date-times by looking at the file name. File names without a time

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/time/SnapshotDateTimeParser.java
View File

@ -19,9 +19,9 @@
package com.sk89q.worldedit.util.time;
import javax.annotation.Nullable;
import java.nio.file.Path;
import java.time.ZonedDateTime;
import javax.annotation.Nullable;
/**
* Instances of this interface try to determine an {@link ZonedDateTime} from a given