Skip to content

Commit 9eced08

Browse files
authored
cleanup implementations of shift, expand and contract methods (#2939)
1 parent 51ec8a8 commit 9eced08

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

worldedit-core/src/main/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegion.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.sk89q.worldedit.math.Vector3;
2424
import com.sk89q.worldedit.regions.polyhedron.Edge;
2525
import com.sk89q.worldedit.regions.polyhedron.Triangle;
26+
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
2627
import com.sk89q.worldedit.world.World;
2728

2829
import java.util.ArrayList;
@@ -255,14 +256,16 @@ public Vector3 getCenter() {
255256

256257
@Override
257258
public void expand(BlockVector3... changes) throws RegionOperationException {
259+
throw new RegionOperationException(TranslatableComponent.of("worldedit.selection.convex.error.cannot-expand"));
258260
}
259261

260262
@Override
261263
public void contract(BlockVector3... changes) throws RegionOperationException {
264+
throw new RegionOperationException(TranslatableComponent.of("worldedit.selection.convex.error.cannot-contract"));
262265
}
263266

264267
@Override
265-
public void shift(BlockVector3 change) throws RegionOperationException {
268+
public void shift(BlockVector3 change) {
266269
Vector3 vec = change.toVector3();
267270
shiftCollection(vertices, change);
268271
shiftCollection(vertexBacklog, change);

worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ public void contract(BlockVector3... changes) {
281281
}
282282

283283
@Override
284-
public void shift(BlockVector3 change) throws RegionOperationException {
284+
public void shift(BlockVector3 change) {
285285
pos1 = pos1.add(change);
286286
pos2 = pos2.add(change);
287287

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public void contract(BlockVector3... changes) throws RegionOperationException {
266266
}
267267

268268
@Override
269-
public void shift(BlockVector3 change) throws RegionOperationException {
269+
public void shift(BlockVector3 change) {
270270
center = center.add(change.toBlockVector2());
271271

272272
int changeY = change.y();

worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void contract(BlockVector3... changes) throws RegionOperationException {
143143
}
144144

145145
@Override
146-
public void shift(BlockVector3 change) throws RegionOperationException {
146+
public void shift(BlockVector3 change) {
147147
center = center.add(change);
148148
}
149149

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public void contract(BlockVector3... changes) throws RegionOperationException {
288288
}
289289

290290
@Override
291-
public void shift(BlockVector3 change) throws RegionOperationException {
291+
public void shift(BlockVector3 change) {
292292
for (int i = 0; i < points.size(); ++i) {
293293
BlockVector2 point = points.get(i);
294294
points.set(i, BlockVector2.at(point.x() + change.x(), point.z() + change.z()));

worldedit-core/src/main/resources/lang/strings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,8 @@
427427
"worldedit.selection.convex.info.triangles": "Triangles: {0}",
428428
"worldedit.selection.convex.explain.primary": "Started new selection with vertex {0}.",
429429
"worldedit.selection.convex.explain.secondary": "Added vertex {0} to the selection.",
430+
"worldedit.selection.convex.error.cannot-expand": "Cannot expand a convex polyhedral region.",
431+
"worldedit.selection.convex.error.cannot-contract": "Cannot contract a convex polyhedral region.",
430432
"worldedit.selection.cuboid.info.pos1": "Position 1: {0}",
431433
"worldedit.selection.cuboid.info.pos2": "Position 2: {0}",
432434
"worldedit.selection.cuboid.explain.primary": "First position set to {0}.",

0 commit comments

Comments
 (0)