Fixed a few more issues found looking over the changeset.

2025-07-17 02:04:04 +00:00 · 2018-07-30 23:26:06 +10:00
parent 521238b4eb
commit 1480606b52
272 changed files with 922 additions and 812 deletions
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java
@@ -19,13 +19,19 @@

 package com.sk89q.worldedit.regions;

-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.regions.iterator.RegionIterator;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.storage.ChunkStore;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;

 public abstract class AbstractRegion implements Region {

--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
@@ -19,7 +19,13 @@

 package com.sk89q.worldedit.regions;

-import com.sk89q.worldedit.*;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.storage.ChunkStore;

@@ -27,9 +33,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;

-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
 * An axis-aligned cuboid. It can be defined using two corners of the cuboid.
 */
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/NullRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/NullRegion.java
@@ -19,11 +19,17 @@

 package com.sk89q.worldedit.regions;

-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.world.World;

-import java.util.*;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;

 /**
 * A region that contains no points.
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java
@@ -25,10 +25,11 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.world.World;

-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Set;

+import javax.annotation.Nullable;
+
 /**
 * Represents a physical shape.
 */
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java
@@ -27,9 +27,10 @@ import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
 import com.sk89q.worldedit.world.World;

-import javax.annotation.Nullable;
 import java.util.List;

+import javax.annotation.Nullable;
+
 /**
 * Region selectors create {@link Region}s from a series of "selected points."
 * They are used, for example, to allow users to create a {@link CuboidRegion}
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/TransformRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/TransformRegion.java
@@ -19,6 +19,8 @@

 package com.sk89q.worldedit.regions;

+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
@@ -26,12 +28,11 @@ import com.sk89q.worldedit.math.transform.Identity;
 import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.world.World;

-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;

 /**
 * Transforms another region according to a provided vector {@code Transform}.
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegion3DIterator.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegion3DIterator.java
@@ -19,6 +19,8 @@

 package com.sk89q.worldedit.regions.iterator;

+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.regions.FlatRegion;
@@ -26,8 +28,6 @@ import com.sk89q.worldedit.regions.FlatRegion;
 import java.util.Iterator;
 import java.util.NoSuchElementException;

-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class FlatRegion3DIterator implements Iterator<BlockVector> {

    private Iterator<Vector2D> flatIterator;
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegionIterator.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegionIterator.java
@@ -19,14 +19,14 @@

 package com.sk89q.worldedit.regions.iterator;

+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.regions.Region;

 import java.util.Iterator;

-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class FlatRegionIterator implements Iterator<Vector2D>  {

    private Region region;
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/RegionIterator.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/RegionIterator.java
@@ -19,14 +19,14 @@

 package com.sk89q.worldedit.regions.iterator;

+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.regions.Region;

 import java.util.Iterator;

-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class RegionIterator implements Iterator<BlockVector> {

    private final Region region;
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/polyhedron/Edge.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/polyhedron/Edge.java
@@ -19,10 +19,10 @@

 package com.sk89q.worldedit.regions.polyhedron;

-import com.sk89q.worldedit.Vector;
-
 import static com.google.common.base.Preconditions.checkNotNull;

+import com.sk89q.worldedit.Vector;
+
 public class Edge {

    private final Vector start;
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/polyhedron/Triangle.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/polyhedron/Triangle.java
@@ -19,10 +19,10 @@

 package com.sk89q.worldedit.regions.polyhedron;

-import com.sk89q.worldedit.Vector;
-
 import static com.google.common.base.Preconditions.checkNotNull;

+import com.sk89q.worldedit.Vector;
+
 public class Triangle {

    private String tag = "Triangle";
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java
@@ -19,7 +19,12 @@

 package com.sk89q.worldedit.regions.selector;

-import com.sk89q.worldedit.*;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.internal.cui.CUIRegion;
 import com.sk89q.worldedit.internal.cui.SelectionPointEvent;
@@ -29,11 +34,10 @@ import com.sk89q.worldedit.regions.RegionSelector;
 import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
 import com.sk89q.worldedit.world.World;

-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;

-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;

 /**
 * Creates a {@code CuboidRegion} from a user's selections.
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java
@@ -19,21 +19,29 @@

 package com.sk89q.worldedit.regions.selector;

-import com.sk89q.worldedit.*;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.internal.cui.*;
+import com.sk89q.worldedit.internal.cui.CUIRegion;
+import com.sk89q.worldedit.internal.cui.SelectionCylinderEvent;
+import com.sk89q.worldedit.internal.cui.SelectionMinMaxEvent;
+import com.sk89q.worldedit.internal.cui.SelectionPointEvent;
 import com.sk89q.worldedit.regions.CylinderRegion;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionSelector;
 import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
 import com.sk89q.worldedit.world.World;

-import javax.annotation.Nullable;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;

-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;

 /**
 * Creates a {@code CylinderRegionSelector} from a user's selections.
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java
@@ -19,7 +19,12 @@

 package com.sk89q.worldedit.regions.selector;

-import com.sk89q.worldedit.*;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.internal.cui.CUIRegion;
 import com.sk89q.worldedit.internal.cui.SelectionEllipsoidPointEvent;
@@ -30,11 +35,10 @@ import com.sk89q.worldedit.regions.RegionSelector;
 import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
 import com.sk89q.worldedit.world.World;

-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;

-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;

 /**
 * Creates a {@code EllipsoidRegionSelector} from a user's selections.
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/ArbitraryShape.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/ArbitraryShape.java
@@ -22,9 +22,9 @@ package com.sk89q.worldedit.regions.shape;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.world.block.BlockStateHolder;

 /**
 * Generates solid and hollow shapes according to materials returned by the
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/RegionShape.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/RegionShape.java
@@ -20,8 +20,8 @@
 package com.sk89q.worldedit.regions.shape;

 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.world.block.BlockStateHolder;

 /**
 * Generates solid and hollow shapes according to materials returned by the
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java
@@ -53,7 +53,7 @@ public class WorldEditExpressionEnvironment implements ExpressionEnvironment {

    @Override
    public int getBlockData(double x, double y, double z) {
-        return editSession.getLazyBlock(new Vector(x, y, z)).getData();
+        return 0;
    }

    @Override
@@ -63,7 +63,7 @@ public class WorldEditExpressionEnvironment implements ExpressionEnvironment {

    @Override
    public int getBlockDataAbs(double x, double y, double z) {
-        return editSession.getLazyBlock(new Vector(x, y, z)).getData();
+        return 0;
    }

    @Override
@@ -73,7 +73,7 @@ public class WorldEditExpressionEnvironment implements ExpressionEnvironment {

    @Override
    public int getBlockDataRel(double x, double y, double z) {
-        return editSession.getLazyBlock(new Vector(x, y, z)).getData();
+        return 0;
    }

    public void setCurrentBlock(Vector current) {