Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-27 09:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bukkit

Browse Source
This commit is contained in:
sk89q
2011-01-08 12:20:49 -08:00
parent 007d254978 294e9f92c3
commit d9ef073aef
22 changed files with 862 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/com/sk89q/worldedit/EditSession.java
View File

@ -50,10 +50,6 @@ public class EditSession {
*/
private static Random prng = new Random();
/**
* Server interface.
*/
private ServerInterface server;
/**
* World.
*/
@ -62,23 +58,28 @@ public class EditSession {
/**
* Stores the original blocks before modification.
*/
private DoubleArrayList<BlockVector, BaseBlock> original = new DoubleArrayList<BlockVector, BaseBlock>(
private DoubleArrayList<BlockVector, BaseBlock> original =
new DoubleArrayList<BlockVector, BaseBlock>(
true);
/**
* Stores the current blocks.
*/
private DoubleArrayList<BlockVector, BaseBlock> current = new DoubleArrayList<BlockVector, BaseBlock>(
private DoubleArrayList<BlockVector, BaseBlock> current =
new DoubleArrayList<BlockVector, BaseBlock>(
false);
/**
* Blocks that should be placed before last.
*/
private DoubleArrayList<BlockVector, BaseBlock> queueAfter = new DoubleArrayList<BlockVector, BaseBlock>(
private DoubleArrayList<BlockVector, BaseBlock> queueAfter =
new DoubleArrayList<BlockVector, BaseBlock>(
false);
/**
* Blocks that should be placed last.
*/
private DoubleArrayList<BlockVector, BaseBlock> queueLast = new DoubleArrayList<BlockVector, BaseBlock>(
private DoubleArrayList<BlockVector, BaseBlock> queueLast =
new DoubleArrayList<BlockVector, BaseBlock>(
false);
/**
* The maximum number of blocks to change at a time. If this number is
* exceeded, a MaxChangedBlocksException exception will be raised. -1
@ -112,7 +113,6 @@ public class EditSession {
}
this.maxBlocks = maxBlocks;
this.server = server;
this.world = world;
}
@ -131,7 +131,6 @@ public class EditSession {
this.maxBlocks = maxBlocks;
this.blockBag = blockBag;
this.server = server;
this.world = world;
}
@ -144,20 +143,24 @@ public class EditSession {
*/
private boolean rawSetBlock(Vector pt, BaseBlock block) {
int y = pt.getBlockY();
if (y < 0 || y > 127) {
return false;
}
int existing = world.getBlockType(pt);
// Clear the chest so that it doesn't drop items
if (server.getBlockType(world, pt) == 54 && blockBag == null) {
server.clearChest(world, pt);
if (existing == 54 && blockBag == null) {
world.clearChest(pt);
// Ice turns until water so this has to be done first
} else if (existing == BlockID.ICE) {
world.setBlockType(pt, 0);
}
int id = block.getID();
if (blockBag != null) {
int existing = server.getBlockType(world, pt);
if (id > 0) {
try {
blockBag.fetchPlacedBlock(id);
@ -177,25 +180,25 @@ public class EditSession {
}
}
boolean result = server.setBlockType(world, pt, id);
boolean result = world.setBlockType(pt, id);
if (id != 0) {
if (BlockType.usesData(id)) {
server.setBlockData(world, pt, block.getData());
world.setBlockData(pt, block.getData());
}
// Signs
if (block instanceof SignBlock) {
SignBlock signBlock = (SignBlock) block;
String[] text = signBlock.getText();
server.setSignText(world, pt, text);
world.setSignText(pt, text);
// Chests
} else if (block instanceof ChestBlock && blockBag == null) {
ChestBlock chestBlock = (ChestBlock) block;
server.setChestContents(world, pt, chestBlock.getItems());
world.setChestContents(pt, chestBlock.getItems());
// Mob spawners
} else if (block instanceof MobSpawnerBlock) {
MobSpawnerBlock mobSpawnerblock = (MobSpawnerBlock) block;
server.setMobSpawnerType(world, pt, mobSpawnerblock.getMobType());
world.setMobSpawnerType(pt, mobSpawnerblock.getMobType());
}
}
@ -298,21 +301,20 @@ public class EditSession {
* @return BaseBlock
*/
public BaseBlock rawGetBlock(Vector pt) {
int type = server.getBlockType(world, pt);
int data = server.getBlockData(world, pt);
int type = world.getBlockType(pt);
int data = world.getBlockData(pt);
// Sign
if (type == 63 || type == 68) {
String[] text = server.getSignText(world, pt);
String[] text = world.getSignText(pt);
return new SignBlock(type, data, text);
// Chest
} else if (type == 54) {
BaseItemStack[] items = server.getChestContents(world, pt);
BaseItemStack[] items = world.getChestContents(pt);
return new ChestBlock(data, items);
// Mob spawner
} else if (type == 52) {
return new MobSpawnerBlock(data,
server.getMobSpawnerType(world, pt));
return new MobSpawnerBlock(data, world.getMobSpawnerType(pt));
} else {
return new BaseBlock(type, data);
}
@ -1568,6 +1570,54 @@ public class EditSession {
return affected;
}
/**
* Thaw.
*
* @param pos
* @param radius
* @return number of blocks affected
* @throws MaxChangedBlocksException
*/
public int thaw(Vector pos, int radius)
throws MaxChangedBlocksException {
int affected = 0;
int radiusSq = (int)Math.pow(radius, 2);
int ox = pos.getBlockX();
int oy = pos.getBlockY();
int oz = pos.getBlockZ();
BaseBlock air = new BaseBlock(0);
BaseBlock water = new BaseBlock(BlockID.STATIONARY_WATER);
for (int x = ox - radius; x <= ox + radius; x++) {
for (int z = oz - radius; z <= oz + radius; z++) {
if ((new Vector(x, oy, z)).distanceSq(pos) > radiusSq) {
continue;
}
for (int y = 127; y >= 1; y--) {
Vector pt = new Vector(x, y, z);
int id = getBlock(pt).getID();
if (id == BlockID.ICE) { // Ice
if (setBlock(pt, water)) {
affected++;
}
} else if (id == BlockID.SNOW) {
if (setBlock(pt, air)) {
affected++;
}
} else if (id != 0) {
break;
}
}
}
}
return affected;
}
/**
* Make snow.
*
@ -1579,6 +1629,7 @@ public class EditSession {
public int simulateSnow(Vector pos, int radius)
throws MaxChangedBlocksException {
int affected = 0;
int radiusSq = (int)Math.pow(radius, 2);
int ox = pos.getBlockX();
int oy = pos.getBlockY();
@ -1589,7 +1640,7 @@ public class EditSession {
for (int x = ox - radius; x <= ox + radius; x++) {
for (int z = oz - radius; z <= oz + radius; z++) {
if ((new Vector(x, oy, z)).distance(pos) > radius) {
if ((new Vector(x, oy, z)).distanceSq(pos) > radiusSq) {
continue;
}
@ -1812,8 +1863,7 @@ public class EditSession {
if (pineTree) {
makePineTree(new Vector(x, y + 1, z));
} else {
server.generateTree(this, world,
new Vector(x, y + 1, z));
world.generateTree(this, new Vector(x, y + 1, z));
}
affected++;
break;

28
src/com/sk89q/worldedit/LocalPlayer.java
View File

@ -83,8 +83,7 @@ public abstract class LocalPlayer {
byte free = 0;
while (y <= 129) {
if (BlockType.canPassThrough(server.getBlockType(world,
new Vector(x, y, z)))) {
if (BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) {
free++;
} else {
free = 0;
@ -128,7 +127,7 @@ public abstract class LocalPlayer {
byte spots = 0;
while (y <= 129) {
if (BlockType.canPassThrough(server.getBlockType(world, new Vector(x, y, z)))) {
if (BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) {
free++;
} else {
free = 0;
@ -137,7 +136,7 @@ public abstract class LocalPlayer {
if (free == 2) {
spots++;
if (spots == 2) {
int type = server.getBlockType(world, new Vector(x, y - 2, z));
int type = world.getBlockType(new Vector(x, y - 2, z));
// Don't get put in lava!
if (type == 10 || type == 11) {
@ -170,7 +169,7 @@ public abstract class LocalPlayer {
byte free = 0;
while (y >= 1) {
if (BlockType.canPassThrough(server.getBlockType(world, new Vector(x, y, z)))) {
if (BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) {
free++;
} else {
free = 0;
@ -181,7 +180,7 @@ public abstract class LocalPlayer {
// lightly and also check to see if there's something to
// stand upon
while (y >= 0) {
int type = server.getBlockType(world, new Vector(x, y, z));
int type = world.getBlockType(new Vector(x, y, z));
// Don't want to end up in lava
if (type != 0 && type != 10 && type != 11) {
@ -217,15 +216,15 @@ public abstract class LocalPlayer {
LocalWorld world = getPosition().getWorld();
// No free space above
if (server.getBlockType(world, new Vector(x, y, z)) != 0) {
if (world.getBlockType(new Vector(x, y, z)) != 0) {
return false;
}
while (y <= 127) {
// Found a ceiling!
if (!BlockType.canPassThrough(server.getBlockType(world, new Vector(x, y, z)))) {
if (!BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) {
int platformY = Math.max(initialY, y - 3 - clearance);
server.setBlockType(world, new Vector(x, platformY, z),
world.setBlockType(new Vector(x, platformY, z),
BlockType.GLASS.getID());
setPosition(new Vector(x + 0.5, platformY + 1, z + 0.5));
return true;
@ -253,12 +252,12 @@ public abstract class LocalPlayer {
LocalWorld world = getPosition().getWorld();
while (y <= 129) {
if (!BlockType.canPassThrough(server.getBlockType(world, new Vector(x, y, z)))) {
if (!BlockType.canPassThrough(world.getBlockType(new Vector(x, y, z)))) {
break; // Hit something
} else if (y > maxY + 1) {
break;
} else if (y == maxY + 1) {
server.setBlockType(world, new Vector(x, y - 2, z),
world.setBlockType(new Vector(x, y - 2, z),
BlockType.GLASS.getID());
setPosition(new Vector(x + 0.5, y - 1, z + 0.5));
return true;
@ -276,7 +275,9 @@ public abstract class LocalPlayer {
* @return point
*/
public WorldVector getBlockIn() {
return getPosition();
WorldVector pos = getPosition();
return WorldVector.toBlockPoint(pos.getWorld(), pos.getX(),
pos.getY(), pos.getZ());
}
/**
@ -286,7 +287,8 @@ public abstract class LocalPlayer {
*/
public WorldVector getBlockOn() {
WorldVector pos = getPosition();
return new WorldVector(pos.getWorld(), pos.subtract(0, 1, 0));
return WorldVector.toBlockPoint(pos.getWorld(), pos.getX(),
pos.getY() - 1, pos.getZ());
}
/**

151
src/com/sk89q/worldedit/LocalWorld.java
View File

@ -19,12 +19,163 @@
package com.sk89q.worldedit;
import com.sk89q.worldedit.blocks.BaseItemStack;
/**
* Represents a world.
*
* @author sk89q
*/
public abstract class LocalWorld {
/**
* Set block type.
*
* @param pt
* @param type
* @return
*/
public abstract boolean setBlockType(Vector pt, int type);
/**
* Get block type.
*
* @param pt
* @return
*/
public abstract int getBlockType(Vector pt);
/**
* Set block data.
*
* @param pt
* @param data
* @return
*/
public abstract void setBlockData(Vector pt, int data);
/**
* Get block data.
*
* @param pt
* @return
*/
public abstract int getBlockData(Vector pt);
/**
* Set sign text.
*
* @param pt
* @param text
*/
public abstract void setSignText(Vector pt, String[] text);
/**
* Get sign text.
*
* @param pt
* @return
*/
public abstract String[] getSignText(Vector pt);
/**
* Gets the contents of chests. Will return null if the chest does not
* really exist or it is the second block for a double chest.
*
* @param pt
* @return
*/
public abstract BaseItemStack[] getChestContents(Vector pt);
/**
* Sets a chest slot.
*
* @param pt
* @param contents
* @return
*/
public abstract boolean setChestContents(Vector pt,
BaseItemStack[] contents);
/**
* Clear a chest's contents.
*
* @param pt
*/
public abstract boolean clearChest(Vector pt);
/**
* Set mob spawner mob type.
*
* @param pt
* @param mobType
*/
public abstract void setMobSpawnerType(Vector pt,
String mobType);
/**
* Get mob spawner mob type. May return an empty string.
*
* @param pt
* @param mobType
*/
public abstract String getMobSpawnerType(Vector pt);
/**
* Generate a tree at a location.
*
* @param pt
* @return
*/
public abstract boolean generateTree(EditSession editSession, Vector pt);
/**
* Drop an item.
*
* @param pt
* @param type
* @param count
* @param times
*/
public abstract void dropItem(Vector pt, int type,
int count, int times);
/**
* Drop an item.
*
* @param pt
* @param type
* @param count
* @param times
*/
public abstract void dropItem(Vector pt, int type,
int count);
/**
* Drop an item.
*
* @param pt
* @param type
* @param count
* @param times
*/
public abstract void dropItem(Vector pt, int type);
/**
* Simulate a block being mined.
*
* @param pt
*/
public abstract void simulateBlockMine(Vector pt);
/**
* Kill mobs in an area.
*
* @param origin
* @param radius
* @return
*/
public abstract int killMobs(Vector origin, int radius);
/**
* Compare if the other world is equal.
*

160
src/com/sk89q/worldedit/ServerInterface.java
View File

@ -19,162 +19,11 @@
package com.sk89q.worldedit;
import com.sk89q.worldedit.blocks.BaseItemStack;
/**
*
* @author sk89q
*/
public abstract class ServerInterface {
/**
* Set block type.
*
* @param pt
* @param type
* @return
*/
public abstract boolean setBlockType(LocalWorld world, Vector pt, int type);
/**
* Get block type.
*
* @param pt
* @return
*/
public abstract int getBlockType(LocalWorld world, Vector pt);
/**
* Set block data.
*
* @param pt
* @param data
* @return
*/
public abstract void setBlockData(LocalWorld world, Vector pt, int data);
/**
* Get block data.
*
* @param pt
* @return
*/
public abstract int getBlockData(LocalWorld world, Vector pt);
/**
* Set sign text.
*
* @param pt
* @param text
*/
public abstract void setSignText(LocalWorld world, Vector pt, String[] text);
/**
* Get sign text.
*
* @param pt
* @return
*/
public abstract String[] getSignText(LocalWorld world, Vector pt);
/**
* Gets the contents of chests. Will return null if the chest does not
* really exist or it is the second block for a double chest.
*
* @param pt
* @return
*/
public abstract BaseItemStack[] getChestContents(LocalWorld world, Vector pt);
/**
* Sets a chest slot.
*
* @param pt
* @param contents
* @return
*/
public abstract boolean setChestContents(LocalWorld world, Vector pt,
BaseItemStack[] contents);
/**
* Clear a chest's contents.
*
* @param pt
*/
public abstract boolean clearChest(LocalWorld world, Vector pt);
/**
* Checks if a mob type is valid.
*
* @param type
* @return
*/
public abstract boolean isValidMobType(String type);
/**
* Set mob spawner mob type.
*
* @param pt
* @param mobType
*/
public abstract void setMobSpawnerType(LocalWorld world, Vector pt,
String mobType);
/**
* Get mob spawner mob type. May return an empty string.
*
* @param pt
* @param mobType
*/
public abstract String getMobSpawnerType(LocalWorld world, Vector pt);
/**
* Generate a tree at a location.
*
* @param pt
* @return
*/
public abstract boolean generateTree(EditSession editSession,
LocalWorld world, Vector pt);
/**
* Drop an item.
*
* @param pt
* @param type
* @param count
* @param times
*/
public abstract void dropItem(LocalWorld world, Vector pt, int type,
int count, int times);
/**
* Drop an item.
*
* @param pt
* @param type
* @param count
* @param times
*/
public abstract void dropItem(LocalWorld world, Vector pt, int type,
int count);
/**
* Drop an item.
*
* @param pt
* @param type
* @param count
* @param times
*/
public abstract void dropItem(LocalWorld world, Vector pt, int type);
/**
* Simulate a block being mined.
*
* @param pt
*/
public abstract void simulateBlockMine(LocalWorld world, Vector pt);
/**
* Resolves an item name to its ID.
*
@ -182,13 +31,12 @@ public abstract class ServerInterface {
* @return
*/
public abstract int resolveItem(String name);
/**
* Kill mobs in an area.
* Checks if a mob type is valid.
*
* @param origin
* @param radius
* @param type
* @return
*/
public abstract int killMobs(LocalWorld world, Vector origin, int radius);
public abstract boolean isValidMobType(String type);
}

12
src/com/sk89q/worldedit/Vector.java
View File

@ -446,6 +446,18 @@ public class Vector {
Math.pow(pt.z - z, 2));
}
/**
* Get the distance away from a point, squared.
*
* @param pt
* @return distance
*/
public double distanceSq(Vector pt) {
return Math.pow(pt.x - x, 2) +
Math.pow(pt.y - y, 2) +
Math.pow(pt.z - z, 2);
}
/**
* Checks to see if a vector is contained with another.
*

132
src/com/sk89q/worldedit/WorldEditController.java
View File

@ -92,8 +92,6 @@ public class WorldEditController {
this.server = server;
this.config = config;
// Note: Commands should only have the phrase 'air' at the end
// for now (see SMWorldEditListener.canUseCommand)
commands.put("//pos1", "Set editing position #1");
commands.put("//pos2", "Set editing position #2");
commands.put("//hpos1", "Trace editing position #1");
@ -122,11 +120,8 @@ public class WorldEditController {
commands.put("//copy", "Copies the currently selected region");
commands.put("//cut", "Cuts the currently selected region");
commands.put("//paste", "<AtOrigin?> - Pastes the clipboard");
commands.put("//pasteair", "<AtOrigin?> - Pastes the clipboard (with air)");
commands.put("//move", "<Count> <Dir> <LeaveID> - Move the selection");
commands.put("//moveair", "<Count> <Dir> <LeaveID> - Move the selection (with air)");
commands.put("//stack", "<Count> <Dir> - Stacks the selection");
commands.put("//stackair", "<Count> <Dir> - Stacks the selection (with air)");
commands.put("//load", "[Filename] - Load .schematic into clipboard");
commands.put("//save", "[Filename] - Save clipboard to .schematic");
commands.put("//fill", "[ID] [Radius] <Depth> - Fill a hole");
@ -155,6 +150,7 @@ public class WorldEditController {
commands.put("/forestgen", "<Size> <Density> - Make Notch tree forest");
commands.put("/pinegen", "<Size> <Density> - Make an ugly pine tree forest");
commands.put("/snow", "<Radius> - Simulate snow cover");
commands.put("/thaw", "<Radius> - Unthaw/remove snow");
commands.put("/pumpkins", "<Size> - Make a pumpkin forest");
commands.put("/unstuck", "Go up to the first free spot");
commands.put("/ascend", "Go up one level");
@ -436,6 +432,8 @@ public class WorldEditController {
logger.log(Level.INFO, "WorldEdit: " + player.getName() + ": "
+ joinString(split, " "));
}
LocalWorld world = player.getPosition().getWorld();
// Jump to the first free position
if (split[0].equalsIgnoreCase("/unstuck")) {
@ -643,7 +641,7 @@ public class WorldEditController {
// Single super pickaxe mode
} else if (split[0].equalsIgnoreCase("/single")) {
if (!canUseCommand(player, "//")) {
if (!canUseCommand(player, "/")) {
player.printError("You don't have permission for super pickaxe usage.");
return true;
}
@ -658,7 +656,7 @@ public class WorldEditController {
} else if (split[0].equalsIgnoreCase("/area")
|| split[0].equalsIgnoreCase("/recur")) {
if (!canUseCommand(player, "//")) {
if (!canUseCommand(player, "/")) {
player.printError("You don't have permission for super pickaxe usage.");
return true;
}
@ -747,8 +745,7 @@ public class WorldEditController {
return true;
// Paste
} else if (split[0].equalsIgnoreCase("//pasteair") ||
split[0].equalsIgnoreCase("//paste")) {
} else if (split[0].equalsIgnoreCase("//paste")) {
checkArgs(split, 0, 1, split[0]);
boolean atOrigin = split.length > 1
? (split[1].equalsIgnoreCase("true")
@ -756,14 +753,12 @@ public class WorldEditController {
: false;
if (atOrigin) {
Vector pos = session.getClipboard().getOrigin();
session.getClipboard().place(editSession, pos,
split[0].equalsIgnoreCase("//paste"));
session.getClipboard().place(editSession, pos, false);
player.findFreePosition();
player.print("Pasted to copy origin. Undo with //undo");
} else {
Vector pos = session.getPlacementPosition(player);
session.getClipboard().paste(editSession, pos,
split[0].equalsIgnoreCase("//paste"));
session.getClipboard().paste(editSession, pos, false);
player.findFreePosition();
player.print("Pasted relative to you. Undo with //undo");
}
@ -1217,6 +1212,16 @@ public class WorldEditController {
return true;
// Thaw
} else if (split[0].equalsIgnoreCase("/thaw")) {
checkArgs(split, 0, 1, split[0]);
int size = split.length > 1 ? Math.max(1, Integer.parseInt(split[1])) : 10;
int affected = editSession.thaw(player.getBlockIn(), size);
player.print(affected + " surfaces thawed.");
return true;
// Make pumpkin patches
} else if (split[0].equalsIgnoreCase("/pumpkins")) {
checkArgs(split, 0, 1, split[0]);
@ -1228,8 +1233,7 @@ public class WorldEditController {
return true;
// Move
} else if (split[0].equalsIgnoreCase("//moveair") ||
split[0].equalsIgnoreCase("//move")) {
} else if (split[0].equalsIgnoreCase("//move")) {
checkArgs(split, 0, 3, split[0]);
int count = split.length > 1 ? Math.max(1, Integer.parseInt(split[1])) : 1;
Vector dir = getDirection(player,
@ -1242,37 +1246,55 @@ public class WorldEditController {
} else {
replace = new BaseBlock(0);
}
boolean copyAir = split[0].equalsIgnoreCase("//moveair");
int affected = editSession.moveCuboidRegion(session.getRegion(),
dir, count, copyAir, replace);
dir, count, true, replace);
player.print(affected + " blocks moved.");
return true;
// Stack
} else if (split[0].equalsIgnoreCase("//stackair") ||
split[0].equalsIgnoreCase("//stack")) {
} else if (split[0].equalsIgnoreCase("//stack")) {
checkArgs(split, 0, 2, split[0]);
int count = split.length > 1 ? Math.max(1, Integer.parseInt(split[1])) : 1;
Vector dir = getDirection(player,
split.length > 2 ? split[2].toLowerCase() : "me");
boolean copyAir = split[0].equalsIgnoreCase("//stackair");
int affected = editSession.stackCuboidRegion(session.getRegion(),
dir, count, copyAir);
dir, count, true);
player.print(affected + " blocks changed. Undo with //undo");
return true;
// Expand
} else if (split[0].equalsIgnoreCase("//expand")) {
checkArgs(split, 1, 2, split[0]);
checkArgs(split, 1, 3, split[0]);
Vector dir;
if (split[1].equals("vert") || split[1].equals("vertical")) {
Region region = session.getRegion();
int oldSize = region.getSize();
region.expand(new Vector(0, 128, 0));
region.expand(new Vector(0, -128, 0));
session.learnRegionChanges();
int newSize = region.getSize();
player.print("Region expanded " + (newSize - oldSize) + " blocks [top-to-bottom].");
return true;
}
int change = Integer.parseInt(split[1]);
int reverseChange = 0;
if (split.length == 3) {
dir = getDirection(player, split[2].toLowerCase());
try {
reverseChange = Integer.parseInt(split[2]) * -1;
dir = getDirection(player, "me");
} catch (NumberFormatException e) {
dir = getDirection(player, split[2].toLowerCase());
}
} else if (split.length == 4) {
reverseChange = Integer.parseInt(split[2]) * -1;
dir = getDirection(player, split[3].toLowerCase());
} else {
dir = getDirection(player, "me");
}
@ -1280,6 +1302,9 @@ public class WorldEditController {
Region region = session.getRegion();
int oldSize = region.getSize();
region.expand(dir.multiply(change));
if (reverseChange != 0) {
region.expand(dir.multiply(reverseChange));
}
session.learnRegionChanges();
int newSize = region.getSize();
player.print("Region expanded " + (newSize - oldSize) + " blocks.");
@ -1288,11 +1313,20 @@ public class WorldEditController {
// Contract
} else if (split[0].equalsIgnoreCase("//contract")) {
checkArgs(split, 1, 2, split[0]);
checkArgs(split, 1, 3, split[0]);
Vector dir;
int change = Integer.parseInt(split[1]);
int reverseChange = 0;
if (split.length == 3) {
dir = getDirection(player, split[2].toLowerCase());
try {
reverseChange = Integer.parseInt(split[2]) * -1;
dir = getDirection(player, "me");
} catch (NumberFormatException e) {
dir = getDirection(player, split[2].toLowerCase());
}
} else if (split.length == 4) {
reverseChange = Integer.parseInt(split[2]) * -1;
dir = getDirection(player, split[3].toLowerCase());
} else {
dir = getDirection(player, "me");
}
@ -1300,6 +1334,9 @@ public class WorldEditController {
Region region = session.getRegion();
int oldSize = region.getSize();
region.contract(dir.multiply(change));
if (reverseChange != 0) {
region.contract(dir.multiply(reverseChange));
}
session.learnRegionChanges();
int newSize = region.getSize();
player.print("Region contracted " + (oldSize - newSize) + " blocks.");
@ -1359,7 +1396,7 @@ public class WorldEditController {
Math.max(1, Integer.parseInt(split[1])) : -1;
Vector origin = session.getPlacementPosition(player);
int killed = server.killMobs(player.getWorld(), origin, radius);
int killed = world.killMobs(origin, radius);
player.print("Killed " + killed + " mobs.");
return true;
@ -1733,7 +1770,7 @@ public class WorldEditController {
* @param player
*/
public void handleArmSwing(LocalPlayer player) {
if (!canUseCommand(player, "//"))
if (!canUseCommand(player, "/"))
return;
}
@ -1741,22 +1778,20 @@ public class WorldEditController {
* Called on right click.
*
* @param player
* @param world
* @param clicked
* @return false if you want the action to go through
*/
public boolean handleBlockRightClick(LocalPlayer player, LocalWorld world,
Vector clicked) {
public boolean handleBlockRightClick(LocalPlayer player, WorldVector clicked) {
int itemInHand = player.getItemInHand();
// This prevents needless sessions from being created
if (!hasSession(player) && !(itemInHand == config.wandItem &&
canUseCommand(player, "//pos2"))) { return false; }
canUseCommand(player, "/pos2"))) { return false; }
LocalSession session = getSession(player);
if (itemInHand == config.wandItem && session.isToolControlEnabled()
&& canUseCommand(player, "//pos2")) {
&& canUseCommand(player, "/pos2")) {
session.setPos2(clicked);
try {
player.print("Second position set to " + clicked
@ -1767,8 +1802,7 @@ public class WorldEditController {
return true;
} else if (player.isHoldingPickAxe() && session.getTool() != null) {
return session.getTool().act(server, config, player, session,
world, clicked);
return session.getTool().act(server, config, player, session, clicked);
}
return false;
@ -1778,15 +1812,13 @@ public class WorldEditController {
* Called on left click.
*
* @param player
* @param world
* @param clicked
* @return false if you want the action to go through
*/
public boolean handleBlockLeftClick(LocalPlayer player,
LocalWorld world, Vector clicked) {
public boolean handleBlockLeftClick(LocalPlayer player, WorldVector clicked) {
if (!canUseCommand(player, "//pos1")
&& !canUseCommand(player, "//")) { return false; }
if (!canUseCommand(player, "/pos1")
&& !canUseCommand(player, "/")) { return false; }
LocalSession session = getSession(player);
@ -1818,7 +1850,7 @@ public class WorldEditController {
} else if (player.isHoldingPickAxe() && session.hasSuperPickAxe()) {
if (session.getSuperPickaxeMode() != null) {
return session.getSuperPickaxeMode().act(server, config,
player, session, world, clicked);
player, session, clicked);
}
}
@ -1850,7 +1882,7 @@ public class WorldEditController {
split[0] = split[0].substring(1);
}
if (canUseCommand(player, split[0])) {
if (canUseCommand(player, split[0].substring(1))) {
LocalSession session = getSession(player);
BlockBag blockBag = session.getBlockBag(player);
@ -1961,17 +1993,21 @@ public class WorldEditController {
*/
private boolean canUseCommand(LocalPlayer player, String command) {
// Allow the /worldeditselect permission
if (command.equalsIgnoreCase("//pos1")
|| command.equalsIgnoreCase("//pos2")
|| command.equalsIgnoreCase("//hpos1")
|| command.equalsIgnoreCase("//hpos2")) {
if (command.equalsIgnoreCase("/pos1")
|| command.equalsIgnoreCase("/pos2")
|| command.equalsIgnoreCase("/hpos1")
|| command.equalsIgnoreCase("/hpos2")
|| command.equalsIgnoreCase("/chunk")
|| command.equalsIgnoreCase("/expand")
|| command.equalsIgnoreCase("/contract")
|| command.equalsIgnoreCase("/shift")
|| command.equalsIgnoreCase("toggleeditwand")) {
return player.hasPermission(command)
|| player.hasPermission("worldeditselect")
|| player.hasPermission("worldedit");
}
return player.hasPermission(command.replace("air", ""))
|| player.hasPermission("worldedit");
return player.hasPermission("worldedit");
}
/**

15
src/com/sk89q/worldedit/WorldVector.java
View File

@ -93,6 +93,21 @@ public class WorldVector extends Vector {
return world;
}
/**
* Get a block point from a point.
*
* @param x
* @param y
* @param z
* @return point
*/
public static WorldVector toBlockPoint(LocalWorld world, double x, double y,
double z) {
return new WorldVector(world, (int)Math.floor(x),
(int)Math.floor(y),
(int)Math.floor(z));
}
/**
* Gets a BlockVector version.
*

10
src/com/sk89q/worldedit/superpickaxe/AreaPickaxe.java
View File

@ -38,12 +38,12 @@ public class AreaPickaxe implements SuperPickaxeMode {
@Override
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, LocalWorld world,
Vector clicked) {
LocalPlayer player, LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
int ox = clicked.getBlockX();
int oy = clicked.getBlockY();
int oz = clicked.getBlockZ();
int initialType = server.getBlockType(world, clicked);
int initialType = world.getBlockType(clicked);
if (initialType == 0) {
return true;
@ -61,9 +61,9 @@ public class AreaPickaxe implements SuperPickaxeMode {
for (int y = oy - range; y <= oy + range; y++) {
for (int z = oz - range; z <= oz + range; z++) {
Vector pos = new Vector(x, y, z);
if (server.getBlockType(world, pos) == initialType) {
if (world.getBlockType(pos) == initialType) {
if (config.superPickaxeManyDrop) {
server.simulateBlockMine(world, pos);
world.simulateBlockMine(pos);
}
editSession.setBlock(pos, air);

4
src/com/sk89q/worldedit/superpickaxe/BlockReplacer.java
View File

@ -36,9 +36,9 @@ public class BlockReplacer implements SuperPickaxeMode {
@Override
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, LocalWorld world,
Vector clicked) {
LocalPlayer player, LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
EditSession editSession = new EditSession(server, world, -1);
try {

5
src/com/sk89q/worldedit/superpickaxe/QueryTool.java
View File

@ -31,8 +31,9 @@ public class QueryTool implements SuperPickaxeMode {
@Override
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, LocalWorld world,
Vector clicked) {
LocalPlayer player, LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
BaseBlock block = (new EditSession(server, world, 0)).rawGetBlock(clicked);
player.print("\u00A79@" + clicked + ": " + "\u00A7e"

9
src/com/sk89q/worldedit/superpickaxe/RecursivePickaxe.java
View File

@ -41,9 +41,10 @@ public class RecursivePickaxe implements SuperPickaxeMode {
@Override
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, LocalWorld world,
Vector clicked) {
int initialType = server.getBlockType(world, clicked);
LocalPlayer player, LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
int initialType = world.getBlockType(clicked);
if (initialType == 0) {
return true;
@ -95,7 +96,7 @@ public class RecursivePickaxe implements SuperPickaxeMode {
if (editSession.getBlock(pos).getID() == initialType) {
if (drop) {
server.simulateBlockMine(world, pos);
world.simulateBlockMine(pos);
}
editSession.setBlock(pos, air);
} else {

12
src/com/sk89q/worldedit/superpickaxe/SinglePickaxe.java
View File

@ -30,21 +30,21 @@ import com.sk89q.worldedit.blocks.BlockID;
public class SinglePickaxe implements SuperPickaxeMode {
@Override
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, LocalWorld world,
Vector clicked) {
LocalPlayer player, LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
if (server.getBlockType(world, clicked) == BlockID.BEDROCK
if (world.getBlockType(clicked) == BlockID.BEDROCK
&& !player.canDestroyBedrock()) {
return true;
} else if (server.getBlockType(world, clicked) == BlockID.TNT) {
} else if (world.getBlockType(clicked) == BlockID.TNT) {
return false;
}
if (config.superPickaxeDrop) {
server.simulateBlockMine(world, clicked);
world.simulateBlockMine(clicked);
}
server.setBlockType(world, clicked, 0);
world.setBlockType(clicked, 0);
return true;
}

3
src/com/sk89q/worldedit/superpickaxe/SuperPickaxeMode.java
View File

@ -37,6 +37,5 @@ public interface SuperPickaxeMode {
* @return true to deny
*/
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, LocalWorld world,
Vector clicked);
LocalPlayer player, LocalSession session, WorldVector clicked);
}

7
src/com/sk89q/worldedit/superpickaxe/TreePlanter.java
View File

@ -30,13 +30,14 @@ public class TreePlanter implements SuperPickaxeMode {
@Override
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, LocalWorld world,
Vector clicked) {
LocalPlayer player, LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
EditSession editSession =
new EditSession(server, world, session.getBlockChangeLimit());
try {
if (!server.generateTree(editSession, player.getWorld(), clicked)) {
if (!world.generateTree(editSession, clicked)) {
player.printError("Notch won't let you put a tree there.");
}
} finally {