SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Changed /remove[above|below], //set to use visitors.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
sk89q 2014-03-27 19:57:24 -07:00
Ursprung 377182da5f
Commit b21f944570
1 geänderte Dateien mit 46 neuen und 134 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

180
src/main/java/com/sk89q/worldedit/EditSession.java
Datei anzeigen

@ -48,6 +48,9 @@ import com.sk89q.worldedit.util.TreeGenerator;
import java.util.*; import java.util.*;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* This class can wrap all block editing operations into one "edit session" that * This class can wrap all block editing operations into one "edit session" that
* stores the state of the blocks before modification. This allows for easy undo * stores the state of the blocks before modification. This allows for easy undo
@ -825,73 +828,45 @@ public class EditSession {
} }
/** /**
* Remove blocks above. * Remove a cuboid above the given position with a given apothem and a given height.
* *
* @param pos * @param position base position
* @param size * @param apothem an apothem of the cuboid, where the minimum is 1
* @param height * @param height the height of the cuboid, where the minimum is 1
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException * @throws MaxChangedBlocksException
*/ */
public int removeAbove(Vector pos, int size, int height) public int removeAbove(Vector position, int apothem, int height) throws MaxChangedBlocksException {
throws MaxChangedBlocksException { checkNotNull(position, "position must not be null");
int maxY = Math.min(world.getMaxY(), pos.getBlockY() + height - 1); checkArgument(apothem >= 1, "apothem >= 1");
--size; checkArgument(height >= 1, "height >= 1");
int affected = 0;
int oX = pos.getBlockX(); Region region = new CuboidRegion(
int oY = pos.getBlockY(); position.add(-apothem + 1, 0, -apothem + 1),
int oZ = pos.getBlockZ(); position.add(apothem - 1, height - 1, apothem - 1));
Pattern pattern = new SingleBlockPattern(new BaseBlock(BlockID.AIR));
for (int x = oX - size; x <= oX + size; ++x) { return setBlocks(region, pattern);
for (int z = oZ - size; z <= oZ + size; ++z) {
for (int y = oY; y <= maxY; ++y) {
Vector pt = new Vector(x, y, z);
if (getBlockType(pt) != BlockID.AIR) {
setBlock(pt, new BaseBlock(BlockID.AIR));
++affected;
}
}
}
}
return affected;
} }
/** /**
* Remove blocks below. * Remove a cuboid below the given position with a given apothem and a given height.
* *
* @param pos * @param position base position
* @param size * @param apothem an apothem of the cuboid, where the minimum is 1
* @param height * @param height the height of the cuboid, where the minimum is 1
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException * @throws MaxChangedBlocksException
*/ */
public int removeBelow(Vector pos, int size, int height) public int removeBelow(Vector position, int apothem, int height) throws MaxChangedBlocksException {
throws MaxChangedBlocksException { checkNotNull(position, "position must not be null");
int minY = Math.max(0, pos.getBlockY() - height); checkArgument(apothem >= 1, "apothem >= 1");
--size; checkArgument(height >= 1, "height >= 1");
int affected = 0;
int oX = pos.getBlockX(); Region region = new CuboidRegion(
int oY = pos.getBlockY(); position.add(-apothem + 1, 0, -apothem + 1),
int oZ = pos.getBlockZ(); position.add(apothem - 1, -height + 1, apothem - 1));
Pattern pattern = new SingleBlockPattern(new BaseBlock(BlockID.AIR));
for (int x = oX - size; x <= oX + size; ++x) { return setBlocks(region, pattern);
for (int z = oZ - size; z <= oZ + size; ++z) {
for (int y = oY; y >= minY; --y) {
Vector pt = new Vector(x, y, z);
if (getBlockType(pt) != BlockID.AIR) {
setBlock(pt, new BaseBlock(BlockID.AIR));
++affected;
}
}
}
}
return affected;
} }
/** /**
@ -933,95 +908,32 @@ public class EditSession {
} }
/** /**
* Sets all the blocks inside a region to a certain block type. * Sets all the blocks inside a region to a given block type.
* *
* @param region * @param region the region
* @param block * @param block the block
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
public int setBlocks(Region region, BaseBlock block) public int setBlocks(Region region, BaseBlock block) throws MaxChangedBlocksException {
throws MaxChangedBlocksException { return setBlocks(region, new SingleBlockPattern(block));
int affected = 0;
if (region instanceof CuboidRegion) {
// Doing this for speed
Vector min = region.getMinimumPoint();
Vector max = region.getMaximumPoint();
int minX = min.getBlockX();
int minY = min.getBlockY();
int minZ = min.getBlockZ();
int maxX = max.getBlockX();
int maxY = max.getBlockY();
int maxZ = max.getBlockZ();
for (int x = minX; x <= maxX; ++x) {
for (int y = minY; y <= maxY; ++y) {
for (int z = minZ; z <= maxZ; ++z) {
Vector pt = new Vector(x, y, z);
if (setBlock(pt, block)) {
++affected;
}
}
}
}
} else {
for (Vector pt : region) {
if (setBlock(pt, block)) {
++affected;
}
}
}
return affected;
} }
/** /**
* Sets all the blocks inside a region to a certain block type. * Sets all the blocks inside a region to a given pattern.
* *
* @param region * @param region the region
* @param pattern * @param pattern the pattern that provides the replacement block
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
public int setBlocks(Region region, Pattern pattern) public int setBlocks(Region region, Pattern pattern) throws MaxChangedBlocksException {
throws MaxChangedBlocksException { checkNotNull(region, "region must not be null");
int affected = 0; checkNotNull(pattern, "pattern must not be null");
BlockReplace replace = new BlockReplace(this, pattern);
if (region instanceof CuboidRegion) { RegionVisitor visitor = new RegionVisitor(region, replace);
// Doing this for speed OperationHelper.completeLegacy(visitor);
Vector min = region.getMinimumPoint(); return visitor.getAffected();
Vector max = region.getMaximumPoint();
int minX = min.getBlockX();
int minY = min.getBlockY();
int minZ = min.getBlockZ();
int maxX = max.getBlockX();
int maxY = max.getBlockY();
int maxZ = max.getBlockZ();
for (int x = minX; x <= maxX; ++x) {
for (int y = minY; y <= maxY; ++y) {
for (int z = minZ; z <= maxZ; ++z) {
Vector pt = new Vector(x, y, z);
if (setBlock(pt, pattern.next(pt))) {
++affected;
}
}
}
}
} else {
for (Vector pt : region) {
if (setBlock(pt, pattern.next(pt))) {
++affected;
}
}
}
return affected;
} }
/** /**