Moved RegionSelectors and RegionIterators into subpackages.

src/bukkit/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -29,7 +29,7 @@ import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Polygonal2DRegion;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;

src/bukkit/java/com/sk89q/worldedit/bukkit/selections/CuboidSelection.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.bukkit.selections;
 
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import org.bukkit.Location;
 import org.bukkit.World;
 import com.sk89q.worldedit.Vector;

src/bukkit/java/com/sk89q/worldedit/bukkit/selections/Polygonal2DSelection.java

@@ -23,6 +23,8 @@ import java.util.Collections;
 import java.util.List;
 
 import com.sk89q.worldedit.LocalWorld;
+import com.sk89q.worldedit.regions.selector.Polygonal2DRegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import org.bukkit.World;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.bukkit.BukkitUtil;

src/bukkit/java/com/sk89q/worldedit/bukkit/selections/RegionSelection.java

@@ -19,13 +19,14 @@
 
 package com.sk89q.worldedit.bukkit.selections;
 
-import static com.sk89q.worldedit.bukkit.BukkitUtil.toLocation;
-import static com.sk89q.worldedit.bukkit.BukkitUtil.toVector;
-import org.bukkit.Location;
-import org.bukkit.World;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
+import org.bukkit.Location;
+import org.bukkit.World;
+
+import static com.sk89q.worldedit.bukkit.BukkitUtil.toLocation;
+import static com.sk89q.worldedit.bukkit.BukkitUtil.toVector;
 
 public abstract class RegionSelection implements Selection {
 

src/bukkit/java/com/sk89q/worldedit/bukkit/selections/Selection.java

@@ -22,7 +22,7 @@ package com.sk89q.worldedit.bukkit.selections;
 import org.bukkit.Location;
 import org.bukkit.World;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 
 public interface Selection {
     /**

src/forge/java/com/sk89q/worldedit/forge/selections/CuboidSelection.java

@@ -6,8 +6,8 @@ import com.sk89q.worldedit.Location;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.forge.WorldEditMod;
 import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.regions.CuboidRegionSelector;
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 
 public class CuboidSelection extends RegionSelection {
     protected CuboidRegion cuboid;

src/forge/java/com/sk89q/worldedit/forge/selections/Polygonal2DSelection.java

@@ -8,8 +8,8 @@ import net.minecraft.world.World;
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.forge.WorldEditMod;
 import com.sk89q.worldedit.regions.Polygonal2DRegion;
-import com.sk89q.worldedit.regions.Polygonal2DRegionSelector;
+import com.sk89q.worldedit.regions.selector.Polygonal2DRegionSelector;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 
 public class Polygonal2DSelection extends RegionSelection {
     protected Polygonal2DRegion poly2d;

src/forge/java/com/sk89q/worldedit/forge/selections/RegionSelection.java

@@ -8,7 +8,7 @@ import com.sk89q.worldedit.Location;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.forge.WorldEditMod;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 
 public abstract class RegionSelection implements Selection {
     private WeakReference<World> world;

src/forge/java/com/sk89q/worldedit/forge/selections/Selection.java

@@ -4,7 +4,7 @@ import net.minecraft.world.World;
 
 import com.sk89q.worldedit.Location;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 
 public abstract interface Selection {
     public abstract Location getMinimumPoint();

src/main/java/com/sk89q/worldedit/LocalSession.java

@@ -32,9 +32,9 @@ import com.sk89q.worldedit.internal.cui.CUIEvent;
 import com.sk89q.worldedit.internal.cui.CUIRegion;
 import com.sk89q.worldedit.internal.cui.SelectionShapeEvent;
 import com.sk89q.worldedit.masks.Mask;
-import com.sk89q.worldedit.regions.CuboidRegionSelector;
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import com.sk89q.worldedit.session.request.Request;
 import com.sk89q.worldedit.world.snapshot.Snapshot;
 

src/main/java/com/sk89q/worldedit/WorldEdit.java

@@ -33,21 +33,19 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.registry.BlockRegistry;
 import com.sk89q.worldedit.extension.registry.MaskRegistry;
 import com.sk89q.worldedit.extension.registry.PatternRegistry;
-import com.sk89q.worldedit.extent.ExtentDelegate;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.function.mask.Masks;
 import com.sk89q.worldedit.function.pattern.Patterns;
 import com.sk89q.worldedit.internal.InternalEditSessionFactory;
 import com.sk89q.worldedit.masks.Mask;
 import com.sk89q.worldedit.patterns.Pattern;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import com.sk89q.worldedit.scripting.CraftScriptContext;
 import com.sk89q.worldedit.scripting.CraftScriptEngine;
 import com.sk89q.worldedit.scripting.RhinoCraftScriptEngine;
 import com.sk89q.worldedit.session.request.Request;
 import com.sk89q.worldedit.util.LogFormat;
 import com.sk89q.worldedit.util.eventbus.EventBus;
-import com.sk89q.worldedit.util.eventbus.Subscribe;
 
 import javax.script.ScriptException;
 import java.io.*;

src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java

@@ -30,7 +30,7 @@ import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.regions.CuboidRegionSelector;
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
 import com.sk89q.worldedit.regions.Region;
 
 /**

src/main/java/com/sk89q/worldedit/command/SelectionCommands.java

@@ -44,16 +44,16 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.world.storage.ChunkStore;
-import com.sk89q.worldedit.regions.ConvexPolyhedralRegionSelector;
+import com.sk89q.worldedit.regions.selector.ConvexPolyhedralRegionSelector;
-import com.sk89q.worldedit.regions.CuboidRegionSelector;
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
-import com.sk89q.worldedit.regions.CylinderRegionSelector;
+import com.sk89q.worldedit.regions.selector.CylinderRegionSelector;
-import com.sk89q.worldedit.regions.EllipsoidRegionSelector;
+import com.sk89q.worldedit.regions.selector.EllipsoidRegionSelector;
-import com.sk89q.worldedit.regions.ExtendingCuboidRegionSelector;
+import com.sk89q.worldedit.regions.selector.ExtendingCuboidRegionSelector;
-import com.sk89q.worldedit.regions.Polygonal2DRegionSelector;
+import com.sk89q.worldedit.regions.selector.Polygonal2DRegionSelector;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionOperationException;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
-import com.sk89q.worldedit.regions.SphereRegionSelector;
+import com.sk89q.worldedit.regions.selector.SphereRegionSelector;
 
 /**
  * Selection commands.

src/main/java/com/sk89q/worldedit/command/tool/DistanceWand.java

@@ -20,7 +20,7 @@
 package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 
 /**
  * A wand that can be used at a distance.

src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java

@@ -19,19 +19,13 @@
 
 package com.sk89q.worldedit.regions;
 
-import java.util.ArrayList;
+import com.sk89q.worldedit.*;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.Vector2D;
+import com.sk89q.worldedit.regions.iterator.RegionIterator;
 import com.sk89q.worldedit.world.storage.ChunkStore;
 
+import java.util.*;
+
 public abstract class AbstractRegion implements Region {
     /**
      * Stores the world.

src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java

@@ -19,14 +19,13 @@
 
 package com.sk89q.worldedit.regions;
 
+import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.regions.iterator.FlatRegion3DIterator;
+import com.sk89q.worldedit.regions.iterator.FlatRegionIterator;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldedit.LocalWorld;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.Vector2D;
 
 /**
  * Represents a cylindrical region.

src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java

@@ -28,6 +28,8 @@ import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
+import com.sk89q.worldedit.regions.iterator.FlatRegion3DIterator;
+import com.sk89q.worldedit.regions.iterator.FlatRegionIterator;
 
 /**
  * Represents a 2D polygonal region.

src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegion3DIterator.java

@@ -1,10 +1,11 @@
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.iterator;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector2D;
+import com.sk89q.worldedit.regions.FlatRegion;
 
 public class FlatRegion3DIterator implements Iterator<BlockVector> {
 

src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegionIterator.java

@@ -17,12 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.iterator;
 
 import java.util.Iterator;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
+import com.sk89q.worldedit.regions.Region;
 
 public class FlatRegionIterator implements Iterator<Vector2D>  {
 

src/main/java/com/sk89q/worldedit/regions/iterator/RegionIterator.java

@@ -17,12 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.iterator;
 
 import java.util.Iterator;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.regions.Region;
 
 public class RegionIterator implements Iterator<BlockVector> {
     private final Region region;

src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.selector;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,6 +36,8 @@ import com.sk89q.worldedit.internal.cui.CUIRegion;
 import com.sk89q.worldedit.internal.cui.SelectionPointEvent;
 import com.sk89q.worldedit.internal.cui.SelectionPolygonEvent;
 import com.sk89q.worldedit.internal.cui.SelectionShapeEvent;
+import com.sk89q.worldedit.regions.ConvexPolyhedralRegion;
+import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.polyhedron.Triangle;
 
 public class ConvexPolyhedralRegionSelector implements RegionSelector, CUIRegion {

src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.selector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +29,8 @@ import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.internal.cui.CUIRegion;
 import com.sk89q.worldedit.internal.cui.SelectionPointEvent;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.Region;
 
 /**
  * Selector for cuboids.

src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.selector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,6 +33,9 @@ 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.internal.cui.SelectionShapeEvent;
+import com.sk89q.worldedit.regions.CylinderRegion;
+import com.sk89q.worldedit.regions.Region;
+
 import java.text.NumberFormat;
 
 /**

src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.selector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,6 +30,8 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.internal.cui.CUIRegion;
 import com.sk89q.worldedit.internal.cui.SelectionEllipsoidPointEvent;
 import com.sk89q.worldedit.internal.cui.SelectionPointEvent;
+import com.sk89q.worldedit.regions.EllipsoidRegion;
+import com.sk89q.worldedit.regions.Region;
 
 /**
  * Selector for ellipsoids.

src/main/java/com/sk89q/worldedit/regions/selector/ExtendingCuboidRegionSelector.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.selector;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.LocalPlayer;

src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.selector;
 
 import java.util.Collections;
 import java.util.List;
@@ -32,6 +32,8 @@ import com.sk89q.worldedit.internal.cui.CUIRegion;
 import com.sk89q.worldedit.internal.cui.SelectionMinMaxEvent;
 import com.sk89q.worldedit.internal.cui.SelectionPoint2DEvent;
 import com.sk89q.worldedit.internal.cui.SelectionShapeEvent;
+import com.sk89q.worldedit.regions.Polygonal2DRegion;
+import com.sk89q.worldedit.regions.Region;
 
 /**
  * Selector for polygonal regions.

src/main/java/com/sk89q/worldedit/regions/selector/RegionSelector.java

@@ -17,14 +17,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.selector;
+
+import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.regions.Region;
 
 import java.util.List;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.IncompleteRegionException;
-import com.sk89q.worldedit.LocalPlayer;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.Vector;
 
 /**
  * Region selection factory.

src/main/java/com/sk89q/worldedit/regions/selector/SphereRegionSelector.java

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldedit.regions;
+package com.sk89q.worldedit.regions.selector;
 
 import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;

src/spout/java/com/sk89q/worldedit/spout/WorldEditPlugin.java

@@ -27,7 +27,7 @@ import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Polygonal2DRegion;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import com.sk89q.worldedit.spout.selections.CuboidSelection;
 import com.sk89q.worldedit.spout.selections.Polygonal2DSelection;
 import com.sk89q.worldedit.spout.selections.Selection;

src/spout/java/com/sk89q/worldedit/spout/selections/CuboidSelection.java

@@ -24,8 +24,8 @@ package com.sk89q.worldedit.spout.selections;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.spout.SpoutUtil;
 import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.regions.CuboidRegionSelector;
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import org.spout.api.geo.World;
 import org.spout.api.geo.discrete.Point;
 

src/spout/java/com/sk89q/worldedit/spout/selections/Polygonal2DSelection.java

@@ -24,8 +24,8 @@ package com.sk89q.worldedit.spout.selections;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.regions.Polygonal2DRegion;
-import com.sk89q.worldedit.regions.Polygonal2DRegionSelector;
+import com.sk89q.worldedit.regions.selector.Polygonal2DRegionSelector;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import com.sk89q.worldedit.spout.SpoutUtil;
 import org.spout.api.geo.World;
 

src/spout/java/com/sk89q/worldedit/spout/selections/RegionSelection.java

@@ -23,7 +23,7 @@ package com.sk89q.worldedit.spout.selections;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import com.sk89q.worldedit.spout.SpoutUtil;
 import org.spout.api.geo.World;
 import org.spout.api.geo.discrete.Point;

src/spout/java/com/sk89q/worldedit/spout/selections/Selection.java

@@ -22,7 +22,7 @@
 package com.sk89q.worldedit.spout.selections;
 
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.RegionSelector;
 import org.spout.api.geo.World;
 import org.spout.api.geo.discrete.Point;