From 75bee27610e785be0b796e3f5cd93acd4831d97b Mon Sep 17 00:00:00 2001 From: sk89q Date: Sun, 30 Mar 2014 12:03:12 -0700 Subject: [PATCH] Move Extent to extent sub-package. --- src/main/java/com/sk89q/worldedit/EditSession.java | 1 + src/main/java/com/sk89q/worldedit/LocalWorld.java | 1 + src/main/java/com/sk89q/worldedit/{ => extent}/Extent.java | 4 +++- src/main/java/com/sk89q/worldedit/extent/ExtentBuffer.java | 1 - .../java/com/sk89q/worldedit/function/block/BlockReplace.java | 2 +- .../com/sk89q/worldedit/function/block/ExtentBlockCopy.java | 2 +- .../com/sk89q/worldedit/function/mask/AbstractExtentMask.java | 2 +- .../java/com/sk89q/worldedit/function/mask/BlockMask.java | 2 +- .../com/sk89q/worldedit/function/mask/ExistingBlockMask.java | 2 +- .../com/sk89q/worldedit/function/mask/FuzzyBlockMask.java | 2 +- .../com/sk89q/worldedit/function/mask/SolidBlockMask.java | 2 +- .../sk89q/worldedit/function/operation/ForwardExtentCopy.java | 2 +- 12 files changed, 13 insertions(+), 10 deletions(-) rename src/main/java/com/sk89q/worldedit/{ => extent}/Extent.java (96%) diff --git a/src/main/java/com/sk89q/worldedit/EditSession.java b/src/main/java/com/sk89q/worldedit/EditSession.java index 66f463a53..4442de0c4 100644 --- a/src/main/java/com/sk89q/worldedit/EditSession.java +++ b/src/main/java/com/sk89q/worldedit/EditSession.java @@ -27,6 +27,7 @@ import com.sk89q.worldedit.blocks.BlockType; import com.sk89q.worldedit.expression.Expression; import com.sk89q.worldedit.expression.ExpressionException; import com.sk89q.worldedit.expression.runtime.RValue; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.ExtentBuffer; import com.sk89q.worldedit.function.GroundFunction; import com.sk89q.worldedit.function.RegionMaskingFilter; diff --git a/src/main/java/com/sk89q/worldedit/LocalWorld.java b/src/main/java/com/sk89q/worldedit/LocalWorld.java index 6b77884e1..e4659459c 100644 --- a/src/main/java/com/sk89q/worldedit/LocalWorld.java +++ b/src/main/java/com/sk89q/worldedit/LocalWorld.java @@ -20,6 +20,7 @@ package com.sk89q.worldedit; import com.sk89q.worldedit.blocks.*; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.foundation.Block; import com.sk89q.worldedit.foundation.World; import com.sk89q.worldedit.regions.Region; diff --git a/src/main/java/com/sk89q/worldedit/Extent.java b/src/main/java/com/sk89q/worldedit/extent/Extent.java similarity index 96% rename from src/main/java/com/sk89q/worldedit/Extent.java rename to src/main/java/com/sk89q/worldedit/extent/Extent.java index 284a35603..6047f1e41 100644 --- a/src/main/java/com/sk89q/worldedit/Extent.java +++ b/src/main/java/com/sk89q/worldedit/extent/Extent.java @@ -17,8 +17,10 @@ * along with this program. If not, see . */ -package com.sk89q.worldedit; +package com.sk89q.worldedit.extent; +import com.sk89q.worldedit.Vector; +import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.blocks.BaseBlock; /** diff --git a/src/main/java/com/sk89q/worldedit/extent/ExtentBuffer.java b/src/main/java/com/sk89q/worldedit/extent/ExtentBuffer.java index 741bac613..06074cb16 100644 --- a/src/main/java/com/sk89q/worldedit/extent/ExtentBuffer.java +++ b/src/main/java/com/sk89q/worldedit/extent/ExtentBuffer.java @@ -20,7 +20,6 @@ package com.sk89q.worldedit.extent; import com.sk89q.worldedit.BlockVector; -import com.sk89q.worldedit.Extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.blocks.BaseBlock; diff --git a/src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java b/src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java index a3d80e6eb..b4162929a 100644 --- a/src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java +++ b/src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.block; -import com.sk89q.worldedit.Extent; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.function.RegionFunction; diff --git a/src/main/java/com/sk89q/worldedit/function/block/ExtentBlockCopy.java b/src/main/java/com/sk89q/worldedit/function/block/ExtentBlockCopy.java index c0ba48fae..af28924a9 100644 --- a/src/main/java/com/sk89q/worldedit/function/block/ExtentBlockCopy.java +++ b/src/main/java/com/sk89q/worldedit/function/block/ExtentBlockCopy.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.block; -import com.sk89q.worldedit.Extent; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.blocks.BaseBlock; diff --git a/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java b/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java index 4d90b4e43..7e11ece0c 100644 --- a/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java +++ b/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.mask; -import com.sk89q.worldedit.Extent; +import com.sk89q.worldedit.extent.Extent; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java b/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java index 4228b0deb..875f9f0ac 100644 --- a/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java +++ b/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.mask; -import com.sk89q.worldedit.Extent; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.blocks.BaseBlock; diff --git a/src/main/java/com/sk89q/worldedit/function/mask/ExistingBlockMask.java b/src/main/java/com/sk89q/worldedit/function/mask/ExistingBlockMask.java index b2fe813df..47d11a177 100644 --- a/src/main/java/com/sk89q/worldedit/function/mask/ExistingBlockMask.java +++ b/src/main/java/com/sk89q/worldedit/function/mask/ExistingBlockMask.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.mask; -import com.sk89q.worldedit.Extent; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.blocks.BlockID; diff --git a/src/main/java/com/sk89q/worldedit/function/mask/FuzzyBlockMask.java b/src/main/java/com/sk89q/worldedit/function/mask/FuzzyBlockMask.java index 10251e172..b08d53cb9 100644 --- a/src/main/java/com/sk89q/worldedit/function/mask/FuzzyBlockMask.java +++ b/src/main/java/com/sk89q/worldedit/function/mask/FuzzyBlockMask.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.mask; -import com.sk89q.worldedit.Extent; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.blocks.BaseBlock; diff --git a/src/main/java/com/sk89q/worldedit/function/mask/SolidBlockMask.java b/src/main/java/com/sk89q/worldedit/function/mask/SolidBlockMask.java index fb0607637..8769236c0 100644 --- a/src/main/java/com/sk89q/worldedit/function/mask/SolidBlockMask.java +++ b/src/main/java/com/sk89q/worldedit/function/mask/SolidBlockMask.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.mask; -import com.sk89q.worldedit.Extent; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.blocks.BlockType; diff --git a/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java b/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java index f768ee73f..c0262bd5e 100644 --- a/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java +++ b/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.operation; -import com.sk89q.worldedit.Extent; +import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.function.CombinedRegionFunction;