Restore the formatting of many things to upstream WorldEdit - no code changes

This patch touches many files but changes absolutely no functionality.
The goal here is to make future merges with worldedit produce fewer
conflicts that have to be resolved.

This patch was made by painstakingly diff'ing files and copying changes
over from the last upstream merge commit (02c6f11b) into this codebase.

Signed-off-by: Byron Marohn <combustible@live.com>

worldedit-core/src/main/java/com/sk89q/worldedit/function/EditContext.java

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit.function;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.regions.Region;
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class EditContext {
 
     private Extent destination;

worldedit-core/src/main/java/com/sk89q/worldedit/function/FlatRegionMaskingFilter.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.function;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.mask.Mask2D;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Passes calls to {@link #apply(com.sk89q.worldedit.Vector2D)} to the
  * delegate {@link com.sk89q.worldedit.function.FlatRegionFunction} if they

worldedit-core/src/main/java/com/sk89q/worldedit/function/GroundFunction.java

@@ -19,13 +19,12 @@
 
 package com.sk89q.worldedit.function;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.mask.Mask;
 
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Applies a {@link RegionFunction} to the first ground block.
  */
@@ -38,7 +37,7 @@ public class GroundFunction implements LayerFunction {
     /**
      * Create a new ground function.
      *
-     * @param mask     a mask
+     * @param mask a mask
      * @param function the function to apply
      */
     public GroundFunction(Mask mask, RegionFunction function) {
@@ -88,6 +87,7 @@ public class GroundFunction implements LayerFunction {
                 affected++;
             }
         }
+
         return false;
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.function;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.mask.Mask;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Passes calls to {@link #apply(com.sk89q.worldedit.Vector)} to the
  * delegate {@link com.sk89q.worldedit.function.RegionFunction} if they

worldedit-core/src/main/java/com/sk89q/worldedit/function/biome/BiomeReplace.java

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit.function.biome;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.FlatRegionFunction;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Replaces the biome at the locations that this function is applied to.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Apply.java

@@ -19,6 +19,9 @@
 
 package com.sk89q.worldedit.function.factory;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
+
 import com.sk89q.worldedit.function.Contextual;
 import com.sk89q.worldedit.function.EditContext;
 import com.sk89q.worldedit.function.RegionFunction;
@@ -27,9 +30,6 @@ import com.sk89q.worldedit.function.visitor.RegionVisitor;
 import com.sk89q.worldedit.regions.NullRegion;
 import com.sk89q.worldedit.regions.Region;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
-
 public class Apply implements Contextual<Operation> {
 
     private final Region region;

worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java

@@ -19,6 +19,9 @@
 
 package com.sk89q.worldedit.function.factory;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
+
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
@@ -34,9 +37,6 @@ import com.sk89q.worldedit.regions.Region;
 
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
-
 public class Deform implements Contextual<Operation> {
 
     private Extent destination;

worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java

@@ -22,12 +22,12 @@ package com.sk89q.worldedit.function.generator;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.function.pattern.RandomPattern;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 /**
  * Generates flora (which may include tall grass, flowers, etc.).

worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/ForestGenerator.java

@@ -22,11 +22,11 @@ package com.sk89q.worldedit.function.generator;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.util.TreeGenerator;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import com.sk89q.worldedit.function.RegionFunction;
-import com.sk89q.worldedit.util.TreeGenerator;
 
 /**
  * Generates forests by searching for the ground starting from the given upper Y

worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java

@@ -26,8 +26,8 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.Random;

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java

@@ -58,4 +58,4 @@ public abstract class AbstractExtentMask extends AbstractMask {
         this.extent = extent;
     }
 
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BiomeMask2D.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.function.mask;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.world.biome.BaseBiome;
@@ -28,8 +30,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Tests true if the biome at applied points is the same as the one given.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BoundedHeightMask.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.function.mask;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.sk89q.worldedit.Vector;
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 /**
  * Has the criteria where the Y value of passed positions must be within
  * a certain range of Y values (inclusive).

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExistingBlockMask.java

@@ -19,8 +19,8 @@
 
 package com.sk89q.worldedit.function.mask;
 
-import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.extent.Extent;
 
 import javax.annotation.Nullable;
 

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.function.mask;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.internal.expression.Expression;
 import com.sk89q.worldedit.internal.expression.ExpressionException;
@@ -27,8 +29,6 @@ import com.sk89q.worldedit.regions.shape.WorldEditExpressionEnvironment;
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * A mask that evaluates an expression.
  *

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask2D.java

@@ -19,13 +19,13 @@
 
 package com.sk89q.worldedit.function.mask;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.internal.expression.Expression;
 import com.sk89q.worldedit.internal.expression.ExpressionException;
 import com.sk89q.worldedit.internal.expression.runtime.EvaluationException;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class ExpressionMask2D extends AbstractMask2D {
 
     private final Expression expression;

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskIntersection2D.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.function.mask;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector2D;
 
 import java.util.Arrays;
@@ -26,8 +28,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Tests true if all contained masks test true.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter.java

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit.function.mask;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.math.noise.NoiseGenerator;
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * A mask that uses a noise generator and returns true whenever the noise
  * generator returns a value above the given density.

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/NoiseFilter2D.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.function.mask;
 
-import com.sk89q.worldedit.Vector2D;
-import com.sk89q.worldedit.math.noise.NoiseGenerator;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.sk89q.worldedit.Vector2D;
+import com.sk89q.worldedit.math.noise.NoiseGenerator;
+
 /**
  * A mask that uses a noise generator and returns true whenever the noise
  * generator returns a value above the given density.

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/OffsetMask2D.java

@@ -19,10 +19,10 @@
 
 package com.sk89q.worldedit.function.mask;
 
-import com.sk89q.worldedit.Vector2D;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.sk89q.worldedit.Vector2D;
+
 /**
  * Checks whether another mask tests true for a position that is offset
  * a given vector.

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/RegionMask.java

@@ -19,13 +19,13 @@
 
 package com.sk89q.worldedit.function.mask;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.regions.Region;
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * A mask that tests whether given positions are contained within a region.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/DelegateOperation.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.function.operation;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.WorldEditException;
 
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Executes a delegete operation, but returns to another operation upon
  * completing the delegate.

worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.function.operation;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.common.collect.Lists;
 import com.sk89q.worldedit.WorldEditException;
 
@@ -27,8 +29,6 @@ import java.util.Collection;
 import java.util.Deque;
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Executes multiple queues in order.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/function/util/FlatRegionOffset.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.function.util;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.FlatRegionFunction;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Offsets the position parameter by adding a given offset vector.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/function/util/RegionOffset.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.function.util;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.RegionFunction;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Offsets the position parameter by adding a given offset vector.
  */