diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegion.java index c154164e4f..fdeffdaa09 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegion.java @@ -23,6 +23,7 @@ import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.regions.polyhedron.Edge; import com.sk89q.worldedit.regions.polyhedron.Triangle; +import com.sk89q.worldedit.util.formatting.text.TranslatableComponent; import com.sk89q.worldedit.world.World; import java.util.ArrayList; @@ -255,14 +256,16 @@ public Vector3 getCenter() { @Override public void expand(BlockVector3... changes) throws RegionOperationException { + throw new RegionOperationException(TranslatableComponent.of("worldedit.selection.convex.error.cannot-expand")); } @Override public void contract(BlockVector3... changes) throws RegionOperationException { + throw new RegionOperationException(TranslatableComponent.of("worldedit.selection.convex.error.cannot-contract")); } @Override - public void shift(BlockVector3 change) throws RegionOperationException { + public void shift(BlockVector3 change) { Vector3 vec = change.toVector3(); shiftCollection(vertices, change); shiftCollection(vertexBacklog, change); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java index 8efad36549..4b56a0f22f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java @@ -281,7 +281,7 @@ public void contract(BlockVector3... changes) { } @Override - public void shift(BlockVector3 change) throws RegionOperationException { + public void shift(BlockVector3 change) { pos1 = pos1.add(change); pos2 = pos2.add(change); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java index 8594e94f19..90373a3e93 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java @@ -266,7 +266,7 @@ public void contract(BlockVector3... changes) throws RegionOperationException { } @Override - public void shift(BlockVector3 change) throws RegionOperationException { + public void shift(BlockVector3 change) { center = center.add(change.toBlockVector2()); int changeY = change.y(); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java index 75995832d1..2d6505fe40 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java @@ -143,7 +143,7 @@ public void contract(BlockVector3... changes) throws RegionOperationException { } @Override - public void shift(BlockVector3 change) throws RegionOperationException { + public void shift(BlockVector3 change) { center = center.add(change); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java index 5c54e4f26c..08c29cfdec 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java @@ -288,7 +288,7 @@ public void contract(BlockVector3... changes) throws RegionOperationException { } @Override - public void shift(BlockVector3 change) throws RegionOperationException { + public void shift(BlockVector3 change) { for (int i = 0; i < points.size(); ++i) { BlockVector2 point = points.get(i); points.set(i, BlockVector2.at(point.x() + change.x(), point.z() + change.z())); diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json index 42b5935f52..f8d1be3b91 100644 --- a/worldedit-core/src/main/resources/lang/strings.json +++ b/worldedit-core/src/main/resources/lang/strings.json @@ -427,6 +427,8 @@ "worldedit.selection.convex.info.triangles": "Triangles: {0}", "worldedit.selection.convex.explain.primary": "Started new selection with vertex {0}.", "worldedit.selection.convex.explain.secondary": "Added vertex {0} to the selection.", + "worldedit.selection.convex.error.cannot-expand": "Cannot expand a convex polyhedral region.", + "worldedit.selection.convex.error.cannot-contract": "Cannot contract a convex polyhedral region.", "worldedit.selection.cuboid.info.pos1": "Position 1: {0}", "worldedit.selection.cuboid.info.pos2": "Position 2: {0}", "worldedit.selection.cuboid.explain.primary": "First position set to {0}.",