Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-01 06:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added a -p flag to //flip that makes it flip around the player instead of the center of the clipboard.

Browse Source 
- Code cleanup
This commit is contained in:
TomyLobo 2011-08-26 04:57:05 +02:00
parent 84ed4bf4c3
commit 2281684f20
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/sk89q/worldedit/CuboidClipboard.java
View File

@ -167,7 +167,7 @@ public class CuboidClipboard {
Math.abs(sizeRotated.getBlockY()),
Math.abs(sizeRotated.getBlockZ()));
offset = offset.transform2D(angle, 0, 0, 0, 0)
.subtract(shiftX, 0, shiftZ);;
.subtract(shiftX, 0, shiftZ);
}
/**
@ -175,14 +175,15 @@ public class CuboidClipboard {
*
* @param dir
*/
public void flip(FlipDirection dir) {
public void flip(FlipDirection dir, boolean aroundPlayer) {
int width = getWidth();
int length = getLength();
int height = getHeight();
if (dir == FlipDirection.NORTH_SOUTH) {
int len = (int)Math.floor(width / 2);
for (int xs = 0; xs < len; ++xs) {
switch (dir) {
case NORTH_SOUTH:
int wid = (int)Math.floor(width / 2);
for (int xs = 0; xs < wid; ++xs) {
for (int z = 0; z < length; ++z) {
for (int y = 0; y < height; ++y) {
BaseBlock old = data[xs][y][z];
@ -192,7 +193,13 @@ public class CuboidClipboard {
}
}
}
} else if (dir == FlipDirection.WEST_EAST) {
if (aroundPlayer)
offset = offset.setX(1 - offset.getX() - width);
break;
case WEST_EAST:
int len = (int)Math.floor(length / 2);
for (int zs = 0; zs < len; ++zs) {
for (int x = 0; x < width; ++x) {
@ -204,9 +211,15 @@ public class CuboidClipboard {
}
}
}
} else if (dir == FlipDirection.UP_DOWN) {
int len = (int)Math.floor(height / 2);
for (int ys = 0; ys < len; ++ys) {
if (aroundPlayer)
offset = offset.setZ(1 - offset.getZ() - length);
break;
case UP_DOWN:
int hei = (int)Math.floor(height / 2);
for (int ys = 0; ys < hei; ++ys) {
for (int x = 0; x < width; ++x) {
for (int z = 0; z < length; ++z) {
BaseBlock old = data[x][ys][z];
@ -215,6 +228,11 @@ public class CuboidClipboard {
}
}
}
if (aroundPlayer)
offset = offset.setY(1 - offset.getY() - height);
break;
}
}

5
src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java
View File

@ -153,7 +153,8 @@ public class ClipboardCommands {
@Command(
aliases = {"/flip"},
usage = "[dir]",
desc = "Flip the contents of the clipboard",
flags = "p",
desc = "Flip the contents of the clipboard. To flip it around yourself, use the -p flag.",
min = 0,
max = 1
)
@ -166,7 +167,7 @@ public class ClipboardCommands {
args.argsLength() > 0 ? args.getString(0).toLowerCase() : "me");
CuboidClipboard clipboard = session.getClipboard();
clipboard.flip(dir);
clipboard.flip(dir, args.hasFlag('p'));
player.print("Clipboard flipped.");
}