ListTagBuilder createWith(T ... entries) {
+ checkNotNull(entries);
+
+ if (entries.length == 0) {
+ throw new IllegalArgumentException("This method needs an array of at least one entry");
+ }
+
+ Class type = entries[0].getClass();
+ for (int i = 1; i < entries.length; i++) {
+ if (!type.isInstance(entries[i])) {
+ throw new IllegalArgumentException("An array of different tag types was provided");
+ }
+ }
+
+ ListTagBuilder builder = new ListTagBuilder(type);
+ builder.addAll(Arrays.asList(entries));
+ return builder;
+ }
+
+}
diff --git a/src/main/java/com/sk89q/jnbt/LongTag.java b/src/main/java/com/sk89q/jnbt/LongTag.java
index 121f1365d..26e1902a5 100644
--- a/src/main/java/com/sk89q/jnbt/LongTag.java
+++ b/src/main/java/com/sk89q/jnbt/LongTag.java
@@ -19,28 +19,29 @@
package com.sk89q.jnbt;
-import com.sk89q.jnbt.Tag;
-
/**
- * The TAG_Long tag.
- *
- * @author Graham Edgecombe
+ * The {@code TAG_Long} tag.
*
*/
public final class LongTag extends Tag {
- /**
- * The value.
- */
private final long value;
+ /**
+ * Creates the tag with an empty name.
+ *
+ * @param value the value of the tag
+ */
+ public LongTag(long value) {
+ super();
+ this.value = value;
+ }
+
/**
* Creates the tag.
- *
- * @param name
- * The name.
- * @param value
- * The value.
+ *
+ * @param name the name of the tag
+ * @param value the value of the tag
*/
public LongTag(String name, long value) {
super(name);
diff --git a/src/main/java/com/sk89q/jnbt/NBTConstants.java b/src/main/java/com/sk89q/jnbt/NBTConstants.java
index f214f7dec..7c8001b43 100644
--- a/src/main/java/com/sk89q/jnbt/NBTConstants.java
+++ b/src/main/java/com/sk89q/jnbt/NBTConstants.java
@@ -29,14 +29,8 @@ import java.nio.charset.Charset;
*/
public final class NBTConstants {
- /**
- * The character set used by NBT (UTF-8).
- */
public static final Charset CHARSET = Charset.forName("UTF-8");
- /**
- * Tag type constants.
- */
public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2,
TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6,
TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9,
diff --git a/src/main/java/com/sk89q/jnbt/NBTInputStream.java b/src/main/java/com/sk89q/jnbt/NBTInputStream.java
index d50873d12..1d1c5215b 100644
--- a/src/main/java/com/sk89q/jnbt/NBTInputStream.java
+++ b/src/main/java/com/sk89q/jnbt/NBTInputStream.java
@@ -27,20 +27,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.sk89q.jnbt.ByteArrayTag;
-import com.sk89q.jnbt.ByteTag;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.DoubleTag;
-import com.sk89q.jnbt.EndTag;
-import com.sk89q.jnbt.FloatTag;
-import com.sk89q.jnbt.IntTag;
-import com.sk89q.jnbt.ListTag;
-import com.sk89q.jnbt.LongTag;
-import com.sk89q.jnbt.NBTConstants;
-import com.sk89q.jnbt.NBTUtils;
-import com.sk89q.jnbt.ShortTag;
-import com.sk89q.jnbt.StringTag;
-import com.sk89q.jnbt.Tag;
/**
*
@@ -60,19 +46,14 @@ import com.sk89q.jnbt.Tag;
*/
public final class NBTInputStream implements Closeable {
- /**
- * The data input stream.
- */
private final DataInputStream is;
/**
- * Creates a new NBTInputStream, which will source its data
+ * Creates a new {@code NBTInputStream}, which will source its data
* from the specified input stream.
*
- * @param is
- * The input stream.
- * @throws IOException
- * if an I/O error occurs.
+ * @param is the input stream
+ * @throws IOException if an I/O error occurs
*/
public NBTInputStream(InputStream is) throws IOException {
this.is = new DataInputStream(is);
@@ -82,8 +63,7 @@ public final class NBTInputStream implements Closeable {
* Reads an NBT tag from the stream.
*
* @return The tag that was read.
- * @throws IOException
- * if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public Tag readTag() throws IOException {
return readTag(0);
@@ -92,11 +72,9 @@ public final class NBTInputStream implements Closeable {
/**
* Reads an NBT from the stream.
*
- * @param depth
- * The depth of this tag.
+ * @param depth the depth of this tag
* @return The tag that was read.
- * @throws IOException
- * if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
private Tag readTag(int depth) throws IOException {
int type = is.readByte() & 0xFF;
@@ -117,18 +95,13 @@ public final class NBTInputStream implements Closeable {
/**
* Reads the payload of a tag, given the name and type.
*
- * @param type
- * The type.
- * @param name
- * The name.
- * @param depth
- * The depth.
- * @return The tag.
- * @throws IOException
- * if an I/O error occurs.
+ * @param type the type
+ * @param name the name
+ * @param depth the depth
+ * @return the tag
+ * @throws IOException if an I/O error occurs.
*/
- private Tag readTagPayload(int type, String name, int depth)
- throws IOException {
+ private Tag readTagPayload(int type, String name, int depth) throws IOException {
switch (type) {
case NBTConstants.TYPE_END:
if (depth == 0) {
@@ -197,6 +170,7 @@ public final class NBTInputStream implements Closeable {
}
}
+ @Override
public void close() throws IOException {
is.close();
}
diff --git a/src/main/java/com/sk89q/jnbt/NBTOutputStream.java b/src/main/java/com/sk89q/jnbt/NBTOutputStream.java
index 7c440ef31..d9a56f666 100644
--- a/src/main/java/com/sk89q/jnbt/NBTOutputStream.java
+++ b/src/main/java/com/sk89q/jnbt/NBTOutputStream.java
@@ -24,21 +24,6 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
-import java.util.zip.GZIPOutputStream;
-import com.sk89q.jnbt.ByteArrayTag;
-import com.sk89q.jnbt.ByteTag;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.DoubleTag;
-import com.sk89q.jnbt.EndTag;
-import com.sk89q.jnbt.FloatTag;
-import com.sk89q.jnbt.IntTag;
-import com.sk89q.jnbt.ListTag;
-import com.sk89q.jnbt.LongTag;
-import com.sk89q.jnbt.NBTConstants;
-import com.sk89q.jnbt.NBTUtils;
-import com.sk89q.jnbt.ShortTag;
-import com.sk89q.jnbt.StringTag;
-import com.sk89q.jnbt.Tag;
/**
*
@@ -72,7 +57,7 @@ public final class NBTOutputStream implements Closeable {
* if an I/O error occurs.
*/
public NBTOutputStream(OutputStream os) throws IOException {
- this.os = new DataOutputStream(new GZIPOutputStream(os));
+ this.os = new DataOutputStream(os);
}
/**
diff --git a/src/main/java/com/sk89q/jnbt/NBTUtils.java b/src/main/java/com/sk89q/jnbt/NBTUtils.java
index 53983022c..20b3e5542 100644
--- a/src/main/java/com/sk89q/jnbt/NBTUtils.java
+++ b/src/main/java/com/sk89q/jnbt/NBTUtils.java
@@ -19,23 +19,31 @@
package com.sk89q.jnbt;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.storage.InvalidFormatException;
import java.util.Map;
+import static com.google.common.base.Preconditions.checkNotNull;
+
/**
* A class which contains NBT-related utility methods.
*
- * @author Graham Edgecombe
- *
*/
public final class NBTUtils {
+ /**
+ * Default private constructor.
+ */
+ private NBTUtils() {
+ }
+
/**
* Gets the type name of a tag.
*
- * @param clazz
- * The tag class.
+ * @param clazz the tag class
* @return The type name.
*/
public static String getTypeName(Class clazz) {
@@ -72,11 +80,9 @@ public final class NBTUtils {
/**
* Gets the type code of a tag class.
*
- * @param clazz
- * The tag class.
+ * @param clazz the tag class
* @return The type code.
- * @throws IllegalArgumentException
- * if the tag class is invalid.
+ * @throws IllegalArgumentException if the tag class is invalid.
*/
public static int getTypeCode(Class clazz) {
if (clazz.equals(ByteArrayTag.class)) {
@@ -112,11 +118,9 @@ public final class NBTUtils {
/**
* Gets the class of a type of tag.
*
- * @param type
- * The type.
+ * @param type the type
* @return The class.
- * @throws IllegalArgumentException
- * if the tag type is invalid.
+ * @throws IllegalArgumentException if the tag type is invalid.
*/
public static Class getTypeClass(int type) {
switch (type) {
@@ -151,10 +155,17 @@ public final class NBTUtils {
}
/**
- * Default private constructor.
+ * Read a vector from a list tag containing ideally three values: the
+ * X, Y, and Z components.
+ *
+ *
For values that are unavailable, their values will be 0.
+ *
+ * @param listTag the list tag
+ * @return a vector
*/
- private NBTUtils() {
-
+ public static Vector toVector(ListTag listTag) {
+ checkNotNull(listTag);
+ return new Vector(listTag.asDouble(0), listTag.asDouble(1), listTag.asDouble(2));
}
/**
diff --git a/src/main/java/com/sk89q/jnbt/ShortTag.java b/src/main/java/com/sk89q/jnbt/ShortTag.java
index 0a658fa07..fd3ee3a4e 100644
--- a/src/main/java/com/sk89q/jnbt/ShortTag.java
+++ b/src/main/java/com/sk89q/jnbt/ShortTag.java
@@ -19,28 +19,28 @@
package com.sk89q.jnbt;
-import com.sk89q.jnbt.Tag;
-
/**
- * The TAG_Short tag.
- *
- * @author Graham Edgecombe
- *
+ * The {@code TAG_Short} tag.
*/
public final class ShortTag extends Tag {
- /**
- * The value.
- */
private final short value;
+ /**
+ * Creates the tag with an empty name.
+ *
+ * @param value the value of the tag
+ */
+ public ShortTag(short value) {
+ super();
+ this.value = value;
+ }
+
/**
* Creates the tag.
- *
- * @param name
- * The name.
- * @param value
- * The value.
+ *
+ * @param name the name of the tag
+ * @param value the value of the tag
*/
public ShortTag(String name, short value) {
super(name);
diff --git a/src/main/java/com/sk89q/jnbt/StringTag.java b/src/main/java/com/sk89q/jnbt/StringTag.java
index b6687c6fd..409511ab5 100644
--- a/src/main/java/com/sk89q/jnbt/StringTag.java
+++ b/src/main/java/com/sk89q/jnbt/StringTag.java
@@ -19,31 +19,35 @@
package com.sk89q.jnbt;
-import com.sk89q.jnbt.Tag;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
- * The TAG_String tag.
- *
- * @author Graham Edgecombe
- *
+ * The {@code TAG_String} tag.
*/
public final class StringTag extends Tag {
- /**
- * The value.
- */
private final String value;
+ /**
+ * Creates the tag with an empty name.
+ *
+ * @param value the value of the tag
+ */
+ public StringTag(String value) {
+ super();
+ checkNotNull(value);
+ this.value = value;
+ }
+
/**
* Creates the tag.
- *
- * @param name
- * The name.
- * @param value
- * The value.
+ *
+ * @param name the name of the tag
+ * @param value the value of the tag
*/
public StringTag(String name, String value) {
super(name);
+ checkNotNull(value);
this.value = value;
}
diff --git a/src/main/java/com/sk89q/jnbt/Tag.java b/src/main/java/com/sk89q/jnbt/Tag.java
index 18a0a0420..e0d7d3f4b 100644
--- a/src/main/java/com/sk89q/jnbt/Tag.java
+++ b/src/main/java/com/sk89q/jnbt/Tag.java
@@ -20,32 +20,35 @@
package com.sk89q.jnbt;
/**
- * Represents a single NBT tag.
- *
- * @author Graham Edgecombe
- *
+ * Represents a NBT tag.
*/
public abstract class Tag {
- /**
- * The name of this tag.
- */
private final String name;
+ /**
+ * Create a new tag with an empty name.
+ */
+ Tag() {
+ this("");
+ }
+
/**
* Creates the tag with the specified name.
*
- * @param name
- * The name.
+ * @param name the name
*/
- public Tag(String name) {
+ Tag(String name) {
+ if (name == null) {
+ name = "";
+ }
this.name = name;
}
/**
* Gets the name of this tag.
*
- * @return The name of this tag.
+ * @return the name of this tag
*/
public final String getName() {
return name;
@@ -54,7 +57,7 @@ public abstract class Tag {
/**
* Gets the value of this tag.
*
- * @return The value of this tag.
+ * @return the value
*/
public abstract Object getValue();
diff --git a/src/main/java/com/sk89q/worldedit/EditSession.java b/src/main/java/com/sk89q/worldedit/EditSession.java
index a641f0089..f97f002ea 100644
--- a/src/main/java/com/sk89q/worldedit/EditSession.java
+++ b/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -22,6 +22,8 @@ package com.sk89q.worldedit;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.blocks.BlockType;
+import com.sk89q.worldedit.entity.BaseEntity;
+import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.event.extent.EditSessionEvent;
import com.sk89q.worldedit.extent.ChangeSetExtent;
import com.sk89q.worldedit.extent.Extent;
@@ -69,12 +71,12 @@ import com.sk89q.worldedit.regions.shape.ArbitraryBiomeShape;
import com.sk89q.worldedit.regions.shape.ArbitraryShape;
import com.sk89q.worldedit.regions.shape.RegionShape;
import com.sk89q.worldedit.regions.shape.WorldEditExpressionEnvironment;
-import com.sk89q.worldedit.util.Countable;
-import com.sk89q.worldedit.util.TreeGenerator;
+import com.sk89q.worldedit.util.*;
import com.sk89q.worldedit.util.collection.DoubleArrayList;
import com.sk89q.worldedit.util.eventbus.EventBus;
import com.sk89q.worldedit.world.NullWorld;
import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.biome.BaseBiome;
import javax.annotation.Nullable;
import java.util.*;
@@ -376,6 +378,16 @@ public class EditSession implements Extent {
return changeSet.size();
}
+ @Override
+ public BaseBiome getBiome(Vector2D position) {
+ return bypassNone.getBiome(position);
+ }
+
+ @Override
+ public boolean setBiome(Vector2D position, BaseBiome biome) {
+ return bypassNone.setBiome(position, biome);
+ }
+
@Override
public BaseBlock getLazyBlock(Vector position) {
return world.getLazyBlock(position);
@@ -581,6 +593,12 @@ public class EditSession implements Extent {
return getBlock(position).isAir() && setBlock(position, block);
}
+ @Override
+ @Nullable
+ public Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) {
+ return bypassNone.createEntity(location, entity);
+ }
+
/**
* Insert a contrived block change into the history.
*
@@ -637,6 +655,16 @@ public class EditSession implements Extent {
return getWorld().getMaximumPoint();
}
+ @Override
+ public List getEntities(Region region) {
+ return bypassNone.getEntities(region);
+ }
+
+ @Override
+ public List getEntities() {
+ return bypassNone.getEntities();
+ }
+
/**
* Finish off the queue.
*/
@@ -1148,6 +1176,7 @@ public class EditSession implements Extent {
ForwardExtentCopy copy = new ForwardExtentCopy(this, region, buffer, to);
copy.setTransform(new AffineTransform().translate(dir.multiply(distance)));
copy.setSourceFunction(remove); // Remove
+ copy.setRemovingEntities(true);
if (!copyAir) {
copy.setSourceMask(new ExistingBlockMask(this));
}
@@ -2230,7 +2259,7 @@ public class EditSession implements Extent {
} // while
}
- public int makeBiomeShape(final Region region, final Vector zero, final Vector unit, final BiomeType biomeType, final String expressionString, final boolean hollow) throws ExpressionException, MaxChangedBlocksException {
+ public int makeBiomeShape(final Region region, final Vector zero, final Vector unit, final BaseBiome biomeType, final String expressionString, final boolean hollow) throws ExpressionException, MaxChangedBlocksException {
final Vector2D zero2D = zero.toVector2D();
final Vector2D unit2D = unit.toVector2D();
@@ -2243,7 +2272,7 @@ public class EditSession implements Extent {
final ArbitraryBiomeShape shape = new ArbitraryBiomeShape(region) {
@Override
- protected BiomeType getBiome(int x, int z, BiomeType defaultBiomeType) {
+ protected BaseBiome getBiome(int x, int z, BaseBiome defaultBiomeType) {
final Vector2D current = new Vector2D(x, z);
environment.setCurrentBlock(current.toVector(0));
final Vector2D scaled = current.subtract(zero2D).divide(unit2D);
diff --git a/src/main/java/com/sk89q/worldedit/LocalSession.java b/src/main/java/com/sk89q/worldedit/LocalSession.java
index df38b58a5..0bf0bfeb3 100644
--- a/src/main/java/com/sk89q/worldedit/LocalSession.java
+++ b/src/main/java/com/sk89q/worldedit/LocalSession.java
@@ -38,11 +38,17 @@ import com.sk89q.worldedit.internal.cui.SelectionShapeEvent;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
+import com.sk89q.worldedit.session.ClipboardHolder;
import com.sk89q.worldedit.session.request.Request;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.snapshot.Snapshot;
-import java.util.*;
+import javax.annotation.Nullable;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.TimeZone;
/**
* An instance of this represents the WorldEdit session of a user. A session
@@ -62,7 +68,7 @@ public class LocalSession {
private boolean placeAtPos1 = false;
private LinkedList history = new LinkedList();
private int historyPointer = 0;
- private CuboidClipboard clipboard;
+ private ClipboardHolder clipboard;
private boolean toolControl = true;
private boolean superPickaxe = false;
private BlockTool pickaxeMode = new SinglePickaxe();
@@ -324,9 +330,9 @@ public class LocalSession {
* Gets the clipboard.
*
* @return clipboard, may be null
- * @throws EmptyClipboardException
+ * @throws EmptyClipboardException thrown if no clipboard is set
*/
- public CuboidClipboard getClipboard() throws EmptyClipboardException {
+ public ClipboardHolder getClipboard() throws EmptyClipboardException {
if (clipboard == null) {
throw new EmptyClipboardException();
}
@@ -336,9 +342,11 @@ public class LocalSession {
/**
* Sets the clipboard.
*
- * @param clipboard
+ * Pass {@code null} to clear the clipboard.
+ *
+ * @param clipboard the clipboard, or null if the clipboard is to be cleared
*/
- public void setClipboard(CuboidClipboard clipboard) {
+ public void setClipboard(@Nullable ClipboardHolder clipboard) {
this.clipboard = clipboard;
}
diff --git a/src/main/java/com/sk89q/worldedit/LocalWorld.java b/src/main/java/com/sk89q/worldedit/LocalWorld.java
index 9dd3498cb..ae1112b95 100644
--- a/src/main/java/com/sk89q/worldedit/LocalWorld.java
+++ b/src/main/java/com/sk89q/worldedit/LocalWorld.java
@@ -19,13 +19,11 @@
package com.sk89q.worldedit;
-import com.sk89q.worldedit.blocks.*;
+import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.util.TreeGenerator;
import com.sk89q.worldedit.world.AbstractWorld;
import com.sk89q.worldedit.world.World;
-import java.util.Random;
-
/**
* A legacy abstract implementation of {@link World}. New implementations
* should use {@link AbstractWorld} when possible.
@@ -35,140 +33,11 @@ import java.util.Random;
@Deprecated
public abstract class LocalWorld extends AbstractWorld {
- /**
- * Named flags to use as parameters to {@link LocalWorld#killMobs(Vector, double, int)}
- */
- @SuppressWarnings("PointlessBitwiseExpression")
- public final class KillFlags {
- public static final int PETS = 1 << 0;
- public static final int NPCS = 1 << 1;
- public static final int ANIMALS = 1 << 2;
- public static final int GOLEMS = 1 << 3;
- public static final int AMBIENT = 1 << 4;
- public static final int TAGGED = 1 << 5;
- public static final int FRIENDLY = PETS | NPCS | ANIMALS | GOLEMS | AMBIENT | TAGGED;
- public static final int WITH_LIGHTNING = 1 << 20;
-
- private KillFlags() {
- }
- }
-
- /**
- * @deprecated Don't use this anymore. It will be removed
- */
- @SuppressWarnings("ProtectedField")
- @Deprecated
- protected Random random = new Random();
-
- @Override
- public BaseBlock getBlock(Vector pt) {
- checkLoadedChunk(pt);
-
- @SuppressWarnings("deprecation") int type = getBlockType(pt);
- @SuppressWarnings("deprecation") int data = getBlockData(pt);
-
- switch (type) {
- case BlockID.WALL_SIGN:
- case BlockID.SIGN_POST: {
- SignBlock block = new SignBlock(type, data);
- copyFromWorld(pt, block);
- return block;
- }
-
- case BlockID.CHEST: {
- ChestBlock block = new ChestBlock(data);
- copyFromWorld(pt, block);
- return block;
- }
-
- case BlockID.FURNACE:
- case BlockID.BURNING_FURNACE: {
- FurnaceBlock block = new FurnaceBlock(type, data);
- copyFromWorld(pt, block);
- return block;
- }
-
- case BlockID.DISPENSER: {
- DispenserBlock block = new DispenserBlock(data);
- copyFromWorld(pt, block);
- return block;
- }
-
- case BlockID.MOB_SPAWNER: {
- MobSpawnerBlock block = new MobSpawnerBlock(data);
- copyFromWorld(pt, block);
- return block;
- }
-
- case BlockID.NOTE_BLOCK: {
- NoteBlock block = new NoteBlock(data);
- copyFromWorld(pt, block);
- return block;
- }
-
- case BlockID.HEAD: {
- SkullBlock block = new SkullBlock(data);
- copyFromWorld(pt, block);
- return block;
- }
-
- default:
- return new BaseBlock(type, data);
- }
- }
-
- /**
- * Given a block and a position, copy data from the world to the block
- * based on the type of block.
- *
- * The provided {@link BaseBlock} should match that of the one in the
- * world.
- *
- * @param position the position
- * @param block the block
- * @return true if the copy operation succeeded, false otherwise
- */
- public abstract boolean copyFromWorld(Vector position, BaseBlock block);
-
@Override
public BaseBlock getLazyBlock(Vector position) {
return getBlock(position);
}
- @Override
- public boolean setBlock(Vector pt, BaseBlock block, boolean notifyAdjacent) throws WorldEditException {
- boolean successful;
-
- // Default implementation will call the old deprecated methods
- if (notifyAdjacent) {
- successful = setTypeIdAndData(pt, block.getId(), block.getData());
- } else {
- successful = setTypeIdAndDataFast(pt, block.getId(), block.getData());
- }
-
- copyToWorld(pt, block);
-
- return successful;
- }
-
- /**
- * Given a block and a position, copy data to the world from the block
- * based on the type of block.
- *
- * The provided {@link BaseBlock} should match that of the one in the
- * world.
- *
- * @param position the position
- * @param block the block
- * @return true if the copy operation succeeded, false otherwise
- */
- public abstract boolean copyToWorld(Vector position, BaseBlock block);
-
- @Override
- public boolean setBlock(Vector pt, BaseBlock block) throws WorldEditException {
- return setBlock(pt, block, true);
- }
-
@Override
public boolean generateTree(TreeGenerator.TreeType type, EditSession editSession, Vector pt) throws MaxChangedBlocksException {
switch (type) {
diff --git a/src/main/java/com/sk89q/worldedit/Vector.java b/src/main/java/com/sk89q/worldedit/Vector.java
index c028c5797..c1fd0475e 100644
--- a/src/main/java/com/sk89q/worldedit/Vector.java
+++ b/src/main/java/com/sk89q/worldedit/Vector.java
@@ -600,8 +600,7 @@ public class Vector implements Comparable {
* @param translateZ what to add after rotation
* @return
*/
- public Vector transform2D(double angle,
- double aboutX, double aboutZ, double translateX, double translateZ) {
+ public Vector transform2D(double angle, double aboutX, double aboutZ, double translateX, double translateZ) {
angle = Math.toRadians(angle);
double x = this.x - aboutX;
double z = this.z - aboutZ;
@@ -652,6 +651,40 @@ public class Vector implements Comparable {
throw new RuntimeException("This should not happen");
}
+ /**
+ * Get this vector's pitch as used within the game.
+ *
+ * @return pitch in radians
+ */
+ public float toPitch() {
+ double x = getX();
+ double z = getZ();
+
+ if (x == 0 && z == 0) {
+ return getY() > 0 ? -90 : 90;
+ } else {
+ double x2 = x * x;
+ double z2 = z * z;
+ double xz = Math.sqrt(x2 + z2);
+ return (float) Math.toDegrees(Math.atan(-getY() / xz));
+ }
+ }
+
+ /**
+ * Get this vector's yaw as used within the game.
+ *
+ * @return yaw in radians
+ */
+ public float toYaw() {
+ double x = getX();
+ double z = getZ();
+
+ double t = Math.atan2(-x, z);
+ double _2pi = 2 * Math.PI;
+
+ return (float) Math.toDegrees(((t + _2pi) % _2pi));
+ }
+
/**
* Get a block point from a point.
*
@@ -792,4 +825,5 @@ public class Vector implements Comparable {
(v1.z + v2.z) / 2
);
}
+
}
diff --git a/src/main/java/com/sk89q/worldedit/Vector2D.java b/src/main/java/com/sk89q/worldedit/Vector2D.java
index 6bb9d7eed..77ba862a1 100644
--- a/src/main/java/com/sk89q/worldedit/Vector2D.java
+++ b/src/main/java/com/sk89q/worldedit/Vector2D.java
@@ -517,8 +517,7 @@ public class Vector2D {
* @param translateZ what to add after rotation
* @return
*/
- public Vector2D transform2D(double angle,
- double aboutX, double aboutZ, double translateX, double translateZ) {
+ public Vector2D transform2D(double angle, double aboutX, double aboutZ, double translateX, double translateZ) {
angle = Math.toRadians(angle);
double x = this.x - aboutX;
double z = this.z - aboutZ;
diff --git a/src/main/java/com/sk89q/worldedit/WorldEdit.java b/src/main/java/com/sk89q/worldedit/WorldEdit.java
index 1a0d25a5e..2e3a4d2df 100644
--- a/src/main/java/com/sk89q/worldedit/WorldEdit.java
+++ b/src/main/java/com/sk89q/worldedit/WorldEdit.java
@@ -27,13 +27,13 @@ import com.sk89q.worldedit.event.extent.EditSessionEvent;
import com.sk89q.worldedit.event.platform.BlockInteractEvent;
import com.sk89q.worldedit.event.platform.InputType;
import com.sk89q.worldedit.event.platform.PlayerInputEvent;
+import com.sk89q.worldedit.extension.factory.BlockFactory;
+import com.sk89q.worldedit.extension.factory.MaskFactory;
+import com.sk89q.worldedit.extension.factory.PatternFactory;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.extension.platform.PlatformManager;
-import com.sk89q.worldedit.extension.registry.BlockRegistry;
-import com.sk89q.worldedit.extension.registry.MaskRegistry;
-import com.sk89q.worldedit.extension.registry.PatternRegistry;
import com.sk89q.worldedit.extent.inventory.BlockBag;
import com.sk89q.worldedit.function.mask.Masks;
import com.sk89q.worldedit.function.pattern.Patterns;
@@ -46,9 +46,14 @@ import com.sk89q.worldedit.session.SessionManager;
import com.sk89q.worldedit.session.request.Request;
import com.sk89q.worldedit.util.eventbus.EventBus;
import com.sk89q.worldedit.util.logging.WorldEditPrefixHandler;
+import com.sk89q.worldedit.world.registry.BundledBlockData;
import javax.script.ScriptException;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -84,13 +89,14 @@ public class WorldEdit {
private final EditSessionFactory editSessionFactory = new EditSessionFactory.EditSessionFactoryImpl(eventBus);
private final SessionManager sessions = new SessionManager(this);
- private final BlockRegistry blockRegistry = new BlockRegistry(this);
- private final MaskRegistry maskRegistry = new MaskRegistry(this);
- private final PatternRegistry patternRegistry = new PatternRegistry(this);
+ private final BlockFactory blockFactory = new BlockFactory(this);
+ private final MaskFactory maskFactory = new MaskFactory(this);
+ private final PatternFactory patternFactory = new PatternFactory(this);
static {
WorldEditPrefixHandler.register("com.sk89q.worldedit");
getVersion();
+ BundledBlockData.getInstance(); // Load block registry
}
private WorldEdit() {
@@ -132,33 +138,33 @@ public class WorldEdit {
}
/**
- * Get the block registry from which new {@link BaseBlock}s can be
+ * Get the block factory from which new {@link BaseBlock}s can be
* constructed.
*
- * @return the block registry
+ * @return the block factory
*/
- public BlockRegistry getBlockRegistry() {
- return blockRegistry;
+ public BlockFactory getBlockFactory() {
+ return blockFactory;
}
/**
- * Get the mask registry from which new {@link com.sk89q.worldedit.function.mask.Mask}s
+ * Get the mask factory from which new {@link com.sk89q.worldedit.function.mask.Mask}s
* can be constructed.
*
- * @return the mask registry
+ * @return the mask factory
*/
- public MaskRegistry getMaskRegistry() {
- return maskRegistry;
+ public MaskFactory getMaskFactory() {
+ return maskFactory;
}
/**
- * Get the pattern registry from which new {@link com.sk89q.worldedit.function.pattern.Pattern}s
+ * Get the pattern factory from which new {@link com.sk89q.worldedit.function.pattern.Pattern}s
* can be constructed.
*
- * @return the pattern registry
+ * @return the pattern factory
*/
- public PatternRegistry getPatternRegistry() {
- return patternRegistry;
+ public PatternFactory getPatternFactory() {
+ return patternFactory;
}
/**
@@ -211,7 +217,7 @@ public class WorldEdit {
}
/**
- * @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
+ * @deprecated Use {@link #getBlockFactory()} and {@link BlockFactory#parseFromInput(String, ParserContext)}
*/
@SuppressWarnings("deprecation")
@Deprecated
@@ -220,7 +226,7 @@ public class WorldEdit {
}
/**
- * @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
+ * @deprecated Use {@link #getBlockFactory()} and {@link BlockFactory#parseFromInput(String, ParserContext)}
*/
@SuppressWarnings("deprecation")
@Deprecated
@@ -231,11 +237,11 @@ public class WorldEdit {
context.setSession(getSession(player));
context.setRestricted(!allAllowed);
context.setPreferringWildcard(allowNoData);
- return getBlockRegistry().parseFromInput(arg, context);
+ return getBlockFactory().parseFromInput(arg, context);
}
/**
- * @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
+ * @deprecated Use {@link #getBlockFactory()} and {@link BlockFactory#parseFromInput(String, ParserContext)}
*/
@SuppressWarnings("deprecation")
@Deprecated
@@ -244,7 +250,7 @@ public class WorldEdit {
}
/**
- * @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromListInput(String, ParserContext)}
+ * @deprecated Use {@link #getBlockFactory()} and {@link BlockFactory#parseFromListInput(String, ParserContext)}
*/
@Deprecated
@SuppressWarnings("deprecation")
@@ -258,7 +264,7 @@ public class WorldEdit {
}
/**
- * @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
+ * @deprecated Use {@link #getBlockFactory()} and {@link BlockFactory#parseFromInput(String, ParserContext)}
*/
@Deprecated
@SuppressWarnings("deprecation")
@@ -267,7 +273,7 @@ public class WorldEdit {
}
/**
- * @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromListInput(String, ParserContext)}
+ * @deprecated Use {@link #getBlockFactory()} and {@link BlockFactory#parseFromListInput(String, ParserContext)}
*/
@Deprecated
@SuppressWarnings("deprecation")
@@ -276,7 +282,7 @@ public class WorldEdit {
}
/**
- * @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromListInput(String, ParserContext)}
+ * @deprecated Use {@link #getBlockFactory()} and {@link BlockFactory#parseFromListInput(String, ParserContext)}
*/
@Deprecated
@SuppressWarnings("deprecation")
@@ -290,7 +296,7 @@ public class WorldEdit {
}
/**
- * @deprecated Use {@link #getPatternRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
+ * @deprecated Use {@link #getPatternFactory()} and {@link BlockFactory#parseFromInput(String, ParserContext)}
*/
@Deprecated
@SuppressWarnings("deprecation")
@@ -299,11 +305,11 @@ public class WorldEdit {
context.setActor(player);
context.setWorld(player.getWorld());
context.setSession(getSession(player));
- return Patterns.wrap(getPatternRegistry().parseFromInput(input, context));
+ return Patterns.wrap(getPatternFactory().parseFromInput(input, context));
}
/**
- * @deprecated Use {@link #getMaskRegistry()} ()} and {@link MaskRegistry#parseFromInput(String, ParserContext)}
+ * @deprecated Use {@link #getMaskFactory()} ()} and {@link MaskFactory#parseFromInput(String, ParserContext)}
*/
@Deprecated
@SuppressWarnings("deprecation")
@@ -312,7 +318,7 @@ public class WorldEdit {
context.setActor(player);
context.setWorld(player.getWorld());
context.setSession(session);
- return Masks.wrap(getMaskRegistry().parseFromInput(input, context));
+ return Masks.wrap(getMaskFactory().parseFromInput(input, context));
}
/**
diff --git a/src/main/java/com/sk89q/worldedit/WorldVector.java b/src/main/java/com/sk89q/worldedit/WorldVector.java
index 5e3d12b2e..d03137a69 100644
--- a/src/main/java/com/sk89q/worldedit/WorldVector.java
+++ b/src/main/java/com/sk89q/worldedit/WorldVector.java
@@ -20,6 +20,7 @@
package com.sk89q.worldedit;
import com.sk89q.worldedit.internal.LocalWorldAdapter;
+import com.sk89q.worldedit.world.World;
/**
* @deprecated Use {@link com.sk89q.worldedit.util.Location} wherever possible
@@ -97,7 +98,7 @@ public class WorldVector extends Vector {
* @param location the location
*/
public WorldVector(com.sk89q.worldedit.util.Location location) {
- this(LocalWorldAdapter.adapt(location.getWorld()), location.getX(), location.getY(), location.getZ());
+ this(LocalWorldAdapter.adapt((World) location.getExtent()), location.getX(), location.getY(), location.getZ());
}
/**
diff --git a/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java b/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
index 497839125..d89ff8e03 100644
--- a/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
+++ b/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
@@ -100,17 +100,27 @@ public class BaseBlock extends Block implements TileEntityBlock {
* @see #setData(int)
* @see #setNbtData(CompoundTag)
*/
- public BaseBlock(int id, int data, CompoundTag nbtData) throws DataException {
+ public BaseBlock(int id, int data, CompoundTag nbtData) {
setId(id);
setData(data);
setNbtData(nbtData);
}
+ /**
+ * Create a clone of another block.
+ *
+ * @param other the other block
+ */
+ public BaseBlock(BaseBlock other) {
+ this(other.getId(), other.getData(), other.getNbtData());
+ }
+
/**
* Get the ID of the block.
*
* @return ID (between 0 and {@link #MAX_ID})
*/
+ @Override
public int getId() {
return id;
}
@@ -138,6 +148,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
*
* @param id block id (between 0 and {@link #MAX_ID}).
*/
+ @Override
public void setId(int id) {
internalSetId(id);
}
@@ -147,6 +158,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
*
* @return data value (0-15)
*/
+ @Override
public int getData() {
return data;
}
@@ -175,6 +187,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
*
* @param data block data value (between 0 and {@link #MAX_DATA}).
*/
+ @Override
public void setData(int data) {
internalSetData(data);
}
@@ -187,6 +200,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
* @see #setId(int)
* @see #setData(int)
*/
+ @Override
public void setIdAndData(int id, int data) {
setId(id);
setData(data);
@@ -198,6 +212,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
*
* @return true if the data value is -1
*/
+ @Override
public boolean hasWildcardData() {
return getData() == -1;
}
@@ -227,7 +242,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
}
@Override
- public void setNbtData(CompoundTag nbtData) throws DataException {
+ public void setNbtData(CompoundTag nbtData) {
this.nbtData = nbtData;
}
diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java b/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java
new file mode 100644
index 000000000..09c9f8716
--- /dev/null
+++ b/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java
@@ -0,0 +1,71 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.blocks;
+
+/**
+ * Describes the material for a block.
+ */
+public interface BlockMaterial {
+
+ boolean isRenderedAsNormalBlock();
+
+ boolean isFullCube();
+
+ boolean isOpaque();
+
+ boolean isPowerSource();
+
+ boolean isLiquid();
+
+ boolean isSolid();
+
+ float getHardness();
+
+ float getResistance();
+
+ float getSlipperiness();
+
+ boolean isGrassBlocking();
+
+ float getAmbientOcclusionLightValue();
+
+ int getLightOpacity();
+
+ int getLightValue();
+
+ boolean isFragileWhenPushed();
+
+ boolean isUnpushable();
+
+ boolean isAdventureModeExempt();
+
+ boolean isTicksRandomly();
+
+ boolean isUsingNeighborLight();
+
+ boolean isMovementBlocker();
+
+ boolean isBurnable();
+
+ boolean isToolRequired();
+
+ boolean isReplacedDuringPlacement();
+
+}
diff --git a/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java b/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
index a08f70ab3..953168c3b 100644
--- a/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
+++ b/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
@@ -23,15 +23,29 @@ import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.Logging;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.Vector2D;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.entity.Player;
-import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.function.FlatRegionFunction;
+import com.sk89q.worldedit.function.FlatRegionMaskingFilter;
+import com.sk89q.worldedit.function.biome.BiomeReplace;
import com.sk89q.worldedit.function.mask.Mask;
-import com.sk89q.worldedit.masks.BiomeTypeMask;
-import com.sk89q.worldedit.masks.InvertedMask;
+import com.sk89q.worldedit.function.mask.Mask2D;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.function.visitor.FlatRegionVisitor;
+import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.FlatRegion;
import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.regions.Regions;
+import com.sk89q.worldedit.util.command.binding.Switch;
import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.biome.BiomeData;
+import com.sk89q.worldedit.world.registry.BiomeRegistry;
import java.util.HashSet;
import java.util.List;
@@ -64,7 +78,7 @@ public class BiomeCommands {
max = 1
)
@CommandPermissions("worldedit.biome.list")
- public void biomeList(Actor actor, CommandContext args) throws WorldEditException {
+ public void biomeList(Player player, CommandContext args) throws WorldEditException {
int page;
int offset;
int count = 0;
@@ -76,16 +90,22 @@ public class BiomeCommands {
offset = (page - 1) * 19;
}
- List biomes = worldEdit.getServer().getBiomes().all();
+ BiomeRegistry biomeRegistry = player.getWorld().getWorldData().getBiomeRegistry();
+ List biomes = biomeRegistry.getBiomes();
int totalPages = biomes.size() / 19 + 1;
- actor.print("Available Biomes (page " + page + "/" + totalPages + ") :");
- for (BiomeType biome : biomes) {
+ player.print("Available Biomes (page " + page + "/" + totalPages + ") :");
+ for (BaseBiome biome : biomes) {
if (offset > 0) {
offset--;
} else {
- actor.print(" " + biome.getName());
- if (++count == 19) {
- break;
+ BiomeData data = biomeRegistry.getData(biome);
+ if (data != null) {
+ player.print(" " + data.getName());
+ if (++count == 19) {
+ break;
+ }
+ } else {
+ player.print(" ");
}
}
}
@@ -103,7 +123,11 @@ public class BiomeCommands {
max = 0
)
@CommandPermissions("worldedit.biome.info")
- public void biomeInfo(CommandContext args, Player player, LocalSession session) throws WorldEditException {
+ public void biomeInfo(Player player, LocalSession session, CommandContext args) throws WorldEditException {
+ BiomeRegistry biomeRegistry = player.getWorld().getWorldData().getBiomeRegistry();
+ Set biomes = new HashSet();
+ String qualifier;
+
if (args.hasFlag('t')) {
Vector blockPosition = player.getBlockTrace(300);
if (blockPosition == null) {
@@ -111,15 +135,18 @@ public class BiomeCommands {
return;
}
- BiomeType biome = player.getWorld().getBiome(blockPosition.toVector2D());
- player.print("Biome: " + biome.getName());
+ BaseBiome biome = player.getWorld().getBiome(blockPosition.toVector2D());
+ biomes.add(biome);
+
+ qualifier = "at line of sight point";
} else if (args.hasFlag('p')) {
- BiomeType biome = player.getWorld().getBiome(player.getPosition().toVector2D());
- player.print("Biome: " + biome.getName());
+ BaseBiome biome = player.getWorld().getBiome(player.getPosition().toVector2D());
+ biomes.add(biome);
+
+ qualifier = "at your position";
} else {
World world = player.getWorld();
Region region = session.getSelection(world);
- Set biomes = new HashSet();
if (region instanceof FlatRegion) {
for (Vector2D pt : ((FlatRegion) region).asFlatRegion()) {
@@ -131,9 +158,16 @@ public class BiomeCommands {
}
}
- player.print("Biomes:");
- for (BiomeType biome : biomes) {
- player.print(" " + biome.getName());
+ qualifier = "in your selection";
+ }
+
+ player.print(biomes.size() != 1 ? "Biomes " + qualifier + ":" : "Biome " + qualifier + ":");
+ for (BaseBiome biome : biomes) {
+ BiomeData data = biomeRegistry.getData(biome);
+ if (data != null) {
+ player.print(" " + data.getName());
+ } else {
+ player.print(" ");
}
}
}
@@ -145,65 +179,31 @@ public class BiomeCommands {
desc = "Sets the biome of the player's current block or region.",
help =
"Set the biome of the region.\n" +
- "By default use all the blocks contained in your selection.\n" +
- "-p use the block you are currently in",
- min = 1,
- max = 1
+ "By default use all the blocks contained in your selection.\n" +
+ "-p use the block you are currently in"
)
@Logging(REGION)
@CommandPermissions("worldedit.biome.set")
- public void setBiome(CommandContext args, Player player, LocalSession session, EditSession editSession) throws WorldEditException {
- final BiomeType target = worldEdit.getServer().getBiomes().get(args.getString(0));
- if (target == null) {
- player.printError("Biome '" + args.getString(0) + "' does not exist!");
- return;
- }
-
+ public void setBiome(Player player, LocalSession session, EditSession editSession, BaseBiome target, @Switch('p') boolean atPosition) throws WorldEditException {
+ World world = player.getWorld();
+ Region region;
Mask mask = editSession.getMask();
- BiomeTypeMask biomeMask = null;
- boolean inverted = false;
- if (mask instanceof BiomeTypeMask) {
- biomeMask = (BiomeTypeMask) mask;
- } else if (mask instanceof InvertedMask && ((InvertedMask) mask).getInvertedMask() instanceof BiomeTypeMask) {
- inverted = true;
- biomeMask = (BiomeTypeMask) ((InvertedMask) mask).getInvertedMask();
- }
+ Mask2D mask2d = mask != null ? mask.toMask2D() : null;
- if (args.hasFlag('p')) {
- Vector2D pos = player.getPosition().toVector2D();
- if (biomeMask == null || (biomeMask.matches2D(editSession, pos) ^ inverted)) {
- player.getWorld().setBiome(pos, target);
- player.print("Biome changed to " + target.getName() + " at your current location.");
- } else {
- player.print("Your global mask doesn't match this biome. Type //gmask to disable it.");
- }
+ if (atPosition) {
+ region = new CuboidRegion(player.getPosition(), player.getPosition());
} else {
- int affected = 0;
- World world = player.getWorld();
- Region region = session.getSelection(world);
-
- if (region instanceof FlatRegion) {
- for (Vector2D pt : ((FlatRegion) region).asFlatRegion()) {
- if (biomeMask == null || (biomeMask.matches2D(editSession, pt) ^ inverted)) {
- world.setBiome(pt, target);
- ++affected;
- }
- }
- } else {
- HashSet alreadyVisited = new HashSet();
- for (Vector pt : region) {
- if (!alreadyVisited.contains((long)pt.getBlockX() << 32 | pt.getBlockZ())) {
- alreadyVisited.add(((long)pt.getBlockX() << 32 | pt.getBlockZ()));
- if (biomeMask == null || (biomeMask.matches(editSession, pt) ^ inverted)) {
- world.setBiome(pt.toVector2D(), target);
- ++affected;
- }
- }
- }
- }
-
- player.print("Biome changed to " + target.getName() + ". " + affected + " columns affected.");
+ region = session.getSelection(world);
}
+
+ FlatRegionFunction replace = new BiomeReplace(editSession, target);
+ if (mask2d != null) {
+ replace = new FlatRegionMaskingFilter(mask2d, replace);
+ }
+ FlatRegionVisitor visitor = new FlatRegionVisitor(Regions.asFlatRegion(region), replace);
+ Operations.completeLegacy(visitor);
+
+ player.print("Biomes were changed in " + visitor.getAffected() + " columns. You may have to rejoin your game (or close and reopen your world) to see a change.");
}
}
diff --git a/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
index f954e26d8..1ce10523e 100644
--- a/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
+++ b/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
@@ -22,17 +22,30 @@ package com.sk89q.worldedit.command;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.LocalWorld.KillFlags;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.command.UtilityCommands.FlagContainer;
import com.sk89q.worldedit.command.tool.BrushTool;
-import com.sk89q.worldedit.command.tool.brush.*;
+import com.sk89q.worldedit.command.tool.brush.ButcherBrush;
+import com.sk89q.worldedit.command.tool.brush.ClipboardBrush;
+import com.sk89q.worldedit.command.tool.brush.CylinderBrush;
+import com.sk89q.worldedit.command.tool.brush.GravityBrush;
+import com.sk89q.worldedit.command.tool.brush.HollowCylinderBrush;
+import com.sk89q.worldedit.command.tool.brush.HollowSphereBrush;
+import com.sk89q.worldedit.command.tool.brush.SmoothBrush;
+import com.sk89q.worldedit.command.tool.brush.SphereBrush;
+import com.sk89q.worldedit.command.util.CreatureButcher;
import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.function.mask.BlockMask;
import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.session.ClipboardHolder;
import com.sk89q.worldedit.util.command.binding.Switch;
import com.sk89q.worldedit.util.command.parametric.Optional;
@@ -117,32 +130,27 @@ public class BrushCommands {
@Command(
aliases = { "clipboard", "copy" },
usage = "",
- flags = "a",
desc = "Choose the clipboard brush",
help =
"Chooses the clipboard brush.\n" +
- "The -a flag makes it not paste air.",
- min = 0,
- max = 0
+ "The -a flag makes it not paste air.\n" +
+ "Without the -p flag, the paste will appear centered at the target location. " +
+ "With the flag, then the paste will appear relative to where you had " +
+ "stood relative to the copied area when you copied it."
)
@CommandPermissions("worldedit.brush.clipboard")
- public void clipboardBrush(Player player, LocalSession session, EditSession editSession, @Switch('a') boolean ignoreAir) throws WorldEditException {
+ public void clipboardBrush(Player player, LocalSession session, EditSession editSession, @Switch('a') boolean ignoreAir, @Switch('p') boolean usingOrigin) throws WorldEditException {
+ ClipboardHolder holder = session.getClipboard();
+ Clipboard clipboard = holder.getClipboard();
- CuboidClipboard clipboard = session.getClipboard();
-
- if (clipboard == null) {
- player.printError("Copy something first.");
- return;
- }
-
- Vector size = clipboard.getSize();
+ Vector size = clipboard.getDimensions();
worldEdit.checkMaxBrushRadius(size.getBlockX());
worldEdit.checkMaxBrushRadius(size.getBlockY());
worldEdit.checkMaxBrushRadius(size.getBlockZ());
BrushTool tool = session.getBrushTool(player.getItemInHand());
- tool.setBrush(new ClipboardBrush(clipboard, ignoreAir), "worldedit.brush.clipboard");
+ tool.setBrush(new ClipboardBrush(holder, ignoreAir, usingOrigin), "worldedit.brush.clipboard");
player.print("Clipboard brush shape equipped.");
}
@@ -220,13 +228,21 @@ public class BrushCommands {
@Command(
aliases = { "butcher", "kill" },
- usage = "[radius] [command flags]",
+ usage = "[radius]",
+ flags = "plangbtf",
desc = "Butcher brush",
help = "Kills nearby mobs within the specified radius.\n" +
- "Any number of 'flags' that the //butcher command uses\n" +
- "may be specified as an argument",
+ "Flags:" +
+ " -p also kills pets.\n" +
+ " -n also kills NPCs.\n" +
+ " -g also kills Golems.\n" +
+ " -a also kills animals.\n" +
+ " -b also kills ambient mobs.\n" +
+ " -t also kills mobs with name tags.\n" +
+ " -f compounds all previous flags.\n" +
+ " -l currently does nothing.",
min = 0,
- max = 2
+ max = 1
)
@CommandPermissions("worldedit.brush.butcher")
public void butcherBrush(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException {
@@ -245,24 +261,13 @@ public class BrushCommands {
return;
}
- FlagContainer flags = new FlagContainer(player);
- if (args.argsLength() == 2) {
- String flagString = args.getString(1);
- // straight from the command, using contains instead of hasflag
- flags.or(KillFlags.FRIENDLY , flagString.contains("f")); // No permission check here. Flags will instead be filtered by the subsequent calls.
- flags.or(KillFlags.PETS , flagString.contains("p"), "worldedit.butcher.pets");
- flags.or(KillFlags.NPCS , flagString.contains("n"), "worldedit.butcher.npcs");
- flags.or(KillFlags.GOLEMS , flagString.contains("g"), "worldedit.butcher.golems");
- flags.or(KillFlags.ANIMALS , flagString.contains("a"), "worldedit.butcher.animals");
- flags.or(KillFlags.AMBIENT , flagString.contains("b"), "worldedit.butcher.ambient");
- flags.or(KillFlags.TAGGED , flagString.contains("t"), "worldedit.butcher.tagged");
- flags.or(KillFlags.WITH_LIGHTNING, flagString.contains("l"), "worldedit.butcher.lightning");
- }
+ CreatureButcher flags = new CreatureButcher(player);
+ flags.fromCommand(args);
+
BrushTool tool = session.getBrushTool(player.getItemInHand());
tool.setSize(radius);
- tool.setBrush(new ButcherBrush(flags.flags), "worldedit.brush.butcher");
+ tool.setBrush(new ButcherBrush(flags), "worldedit.brush.butcher");
- player.print(String.format("Butcher brush equipped (%.0f).",
- radius));
+ player.print(String.format("Butcher brush equipped (%.0f).", radius));
}
}
diff --git a/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java b/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
index ffc765095..a5980cdc2 100644
--- a/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
+++ b/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
@@ -20,19 +20,32 @@
package com.sk89q.worldedit.command;
import com.sk89q.minecraft.util.commands.Command;
-import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.Logging;
-import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.function.block.BlockReplace;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
+import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.internal.annotation.Direction;
+import com.sk89q.worldedit.internal.annotation.Selection;
+import com.sk89q.worldedit.math.transform.AffineTransform;
import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
+import com.sk89q.worldedit.session.ClipboardHolder;
import com.sk89q.worldedit.util.command.binding.Switch;
import com.sk89q.worldedit.util.command.parametric.Optional;
-import com.sk89q.worldedit.world.World;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.minecraft.util.commands.Logging.LogMode.PLACEMENT;
@@ -57,87 +70,63 @@ public class ClipboardCommands {
@Command(
aliases = { "/copy" },
- flags = "e",
+ flags = "em",
desc = "Copy the selection to the clipboard",
help = "Copy the selection to the clipboard\n" +
"Flags:\n" +
" -e controls whether entities are copied\n" +
+ " -m sets a source mask so that excluded blocks become air\n" +
"WARNING: Pasting entities cannot yet be undone!",
min = 0,
max = 0
)
@CommandPermissions("worldedit.clipboard.copy")
- public void copy(Player player, LocalSession session, EditSession editSession, @Switch('e') boolean copyEntities) throws WorldEditException {
- Region region = session.getSelection(player.getWorld());
- Vector min = region.getMinimumPoint();
- Vector max = region.getMaximumPoint();
- Vector pos = session.getPlacementPosition(player);
+ public void copy(Player player, LocalSession session, EditSession editSession,
+ @Selection Region region, @Switch('e') boolean copyEntities,
+ @Switch('m') Mask mask) throws WorldEditException {
- CuboidClipboard clipboard = new CuboidClipboard(
- max.subtract(min).add(Vector.ONE),
- min, min.subtract(pos));
-
- if (region instanceof CuboidRegion) {
- clipboard.copy(editSession);
- } else {
- clipboard.copy(editSession, region);
+ BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
+ clipboard.setOrigin(session.getPlacementPosition(player));
+ ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint());
+ if (mask != null) {
+ copy.setSourceMask(mask);
}
+ Operations.completeLegacy(copy);
+ session.setClipboard(new ClipboardHolder(clipboard, editSession.getWorld().getWorldData()));
- if (copyEntities) {
- for (LocalEntity entity : player.getWorld().getEntities(region)) {
- clipboard.storeEntity(entity);
- }
- }
-
- session.setClipboard(clipboard);
-
- player.print("Block(s) copied.");
+ player.print(region.getArea() + " block(s) were copied.");
}
@Command(
aliases = { "/cut" },
+ flags = "em",
usage = "[leave-id]",
desc = "Cut the selection to the clipboard",
help = "Copy the selection to the clipboard\n" +
"Flags:\n" +
" -e controls whether entities are copied\n" +
+ " -m sets a source mask so that excluded blocks become air\n" +
"WARNING: Cutting and pasting entities cannot yet be undone!",
- flags = "e",
min = 0,
max = 1
)
@CommandPermissions("worldedit.clipboard.cut")
@Logging(REGION)
- public void cut(Player player, LocalSession session, EditSession editSession, @Optional("air") BaseBlock block, @Switch('e') boolean copyEntities) throws WorldEditException {
- World world = player.getWorld();
+ public void cut(Player player, LocalSession session, EditSession editSession,
+ @Selection Region region, @Optional("air") Pattern leavePattern, @Switch('e') boolean copyEntities,
+ @Switch('m') Mask mask) throws WorldEditException {
- Region region = session.getSelection(world);
- Vector min = region.getMinimumPoint();
- Vector max = region.getMaximumPoint();
- Vector pos = session.getPlacementPosition(player);
-
- CuboidClipboard clipboard = new CuboidClipboard(
- max.subtract(min).add(Vector.ONE),
- min, min.subtract(pos));
-
- if (region instanceof CuboidRegion) {
- clipboard.copy(editSession);
- } else {
- clipboard.copy(editSession, region);
+ BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
+ clipboard.setOrigin(session.getPlacementPosition(player));
+ ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint());
+ copy.setSourceFunction(new BlockReplace(editSession, leavePattern));
+ if (mask != null) {
+ copy.setSourceMask(mask);
}
+ Operations.completeLegacy(copy);
+ session.setClipboard(new ClipboardHolder(clipboard, editSession.getWorld().getWorldData()));
- if (copyEntities) {
- LocalEntity[] entities = world.getEntities(region);
- for (LocalEntity entity : entities) {
- clipboard.storeEntity(entity);
- }
- world.killEntities(entities);
- }
-
- session.setClipboard(clipboard);
-
- editSession.setBlocks(region, block);
- player.print("Block(s) cut.");
+ player.print(region.getArea() + " block(s) were copied.");
}
@Command(
@@ -156,79 +145,76 @@ public class ClipboardCommands {
)
@CommandPermissions("worldedit.clipboard.paste")
@Logging(PLACEMENT)
- public void paste(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException {
+ public void paste(Player player, LocalSession session, EditSession editSession,
+ @Switch('a') boolean ignoreAirBlocks, @Switch('o') boolean atOrigin,
+ @Switch('s') boolean selectPasted) throws WorldEditException {
- boolean atOrigin = args.hasFlag('o');
- boolean pasteNoAir = args.hasFlag('a');
+ ClipboardHolder holder = session.getClipboard();
+ Clipboard clipboard = holder.getClipboard();
+ Region region = clipboard.getRegion();
- CuboidClipboard clipboard = session.getClipboard();
+ Vector to = atOrigin ? clipboard.getOrigin() : session.getPlacementPosition(player);
+ Operation operation = holder
+ .createPaste(editSession, editSession.getWorld().getWorldData())
+ .to(to)
+ .ignoreAirBlocks(ignoreAirBlocks)
+ .build();
+ Operations.completeLegacy(operation);
- Vector pos = atOrigin ? session.getClipboard().getOrigin()
- : session.getPlacementPosition(player);
-
- if (atOrigin) {
- clipboard.place(editSession, pos, pasteNoAir);
- clipboard.pasteEntities(pos);
- player.findFreePosition();
- player.print("Pasted to copy origin. Undo with //undo");
- } else {
- clipboard.paste(editSession, pos, pasteNoAir, true);
- player.findFreePosition();
- player.print("Pasted relative to you. Undo with //undo");
+ if (selectPasted) {
+ Vector max = to.add(region.getMaximumPoint().subtract(region.getMinimumPoint()));
+ RegionSelector selector = new CuboidRegionSelector(player.getWorld(), to, max);
+ session.setRegionSelector(player.getWorld(), selector);
+ selector.learnChanges();
+ selector.explainRegionAdjust(player, session);
}
- if (args.hasFlag('s')) {
- World world = player.getWorld();
- Vector pos2 = pos.add(clipboard.getSize().subtract(1, 1, 1));
- if (!atOrigin) {
- pos2 = pos2.add(clipboard.getOffset());
- pos = pos.add(clipboard.getOffset());
- }
- session.setRegionSelector(world, new CuboidRegionSelector(world, pos, pos2));
- session.getRegionSelector(world).learnChanges();
- session.getRegionSelector(world).explainRegionAdjust(player, session);
- }
+ player.print("The clipboard has been pasted at " + to);
}
@Command(
aliases = { "/rotate" },
- usage = "",
+ usage = " [] []",
desc = "Rotate the contents of the clipboard",
- min = 1,
- max = 1
+ help = "Non-destructively rotate the contents of the clipboard.\n" +
+ "Angles are provided in degrees and a positive angle will result in a clockwise rotation. " +
+ "Multiple rotations can be stacked. Interpolation is not performed so angles should be a multiple of 90 degrees.\n"
)
@CommandPermissions("worldedit.clipboard.rotate")
- public void rotate(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException {
-
- int angle = args.getInteger(0);
-
- if (angle % 90 == 0) {
- CuboidClipboard clipboard = session.getClipboard();
- clipboard.rotate2D(angle);
- player.print("Clipboard rotated by " + angle + " degrees.");
- } else {
- player.printError("Angles must be divisible by 90 degrees.");
+ public void rotate(Player player, LocalSession session, Double yRotate, @Optional Double xRotate, @Optional Double zRotate) throws WorldEditException {
+ if ((yRotate != null && Math.abs(yRotate % 90) > 0.001) ||
+ xRotate != null && Math.abs(xRotate % 90) > 0.001 ||
+ zRotate != null && Math.abs(zRotate % 90) > 0.001) {
+ player.printDebug("Note: Interpolation is not yet supported, so angles that are multiples of 90 is recommended.");
}
+
+ ClipboardHolder holder = session.getClipboard();
+ AffineTransform transform = new AffineTransform();
+ transform = transform.rotateY(-(yRotate != null ? yRotate : 0));
+ transform = transform.rotateX(-(xRotate != null ? xRotate : 0));
+ transform = transform.rotateZ(-(zRotate != null ? zRotate : 0));
+ holder.setTransform(holder.getTransform().combine(transform));
+ player.print("The clipboard copy has been rotated.");
}
@Command(
aliases = { "/flip" },
- usage = "[dir]",
- flags = "p",
- desc = "Flip the contents of the clipboard.",
+ usage = "[]",
+ desc = "Flip the contents of the clipboard",
help =
- "Flips the contents of the clipboard.\n" +
- "The -p flag flips the selection around the player,\n" +
- "instead of the selections center.",
+ "Flips the contents of the clipboard across the point from which the copy was made.\n",
min = 0,
max = 1
)
@CommandPermissions("worldedit.clipboard.flip")
- public void flip(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException {
- CuboidClipboard.FlipDirection dir = worldEdit.getFlipDirection(player, args.argsLength() > 0 ? args.getString(0).toLowerCase() : "me");
- CuboidClipboard clipboard = session.getClipboard();
- clipboard.flip(dir, args.hasFlag('p'));
- player.print("Clipboard flipped.");
+ public void flip(Player player, LocalSession session, EditSession editSession,
+ @Optional(Direction.AIM) @Direction Vector direction) throws WorldEditException {
+ ClipboardHolder holder = session.getClipboard();
+ Clipboard clipboard = holder.getClipboard();
+ AffineTransform transform = new AffineTransform();
+ transform = transform.scale(direction.positive().multiply(-2).add(1, 1, 1));
+ holder.setTransform(holder.getTransform().combine(transform));
+ player.print("The clipboard copy has been flipped.");
}
@Command(
diff --git a/src/main/java/com/sk89q/worldedit/command/FlattenedClipboardTransform.java b/src/main/java/com/sk89q/worldedit/command/FlattenedClipboardTransform.java
new file mode 100644
index 000000000..70adc7803
--- /dev/null
+++ b/src/main/java/com/sk89q/worldedit/command/FlattenedClipboardTransform.java
@@ -0,0 +1,143 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.command;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
+import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
+import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.math.transform.AffineTransform;
+import com.sk89q.worldedit.math.transform.CombinedTransform;
+import com.sk89q.worldedit.math.transform.Transform;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.world.registry.WorldData;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Helper class to 'bake' a transform into a clipboard.
+ *
+ * This class needs a better name and may need to be made more generic.
+ *
+ * @see Clipboard
+ * @see Transform
+ */
+class FlattenedClipboardTransform {
+
+ private final Clipboard original;
+ private final Transform transform;
+ private final WorldData worldData;
+
+ /**
+ * Create a new instance.
+ *
+ * @param original the original clipboard
+ * @param transform the transform
+ * @param worldData the world data instance
+ */
+ private FlattenedClipboardTransform(Clipboard original, Transform transform, WorldData worldData) {
+ checkNotNull(original);
+ checkNotNull(transform);
+ checkNotNull(worldData);
+ this.original = original;
+ this.transform = transform;
+ this.worldData = worldData;
+ }
+
+ /**
+ * Get the transformed region.
+ *
+ * @return the transformed region
+ */
+ public Region getTransformedRegion() {
+ Region region = original.getRegion();
+ Vector minimum = region.getMinimumPoint();
+ Vector maximum = region.getMaximumPoint();
+
+ Transform transformAround =
+ new CombinedTransform(
+ new AffineTransform().translate(original.getOrigin().multiply(-1)),
+ transform,
+ new AffineTransform().translate(original.getOrigin()));
+
+ Vector[] corners = new Vector[] {
+ minimum,
+ maximum,
+ minimum.setX(maximum.getX()),
+ minimum.setY(maximum.getY()),
+ minimum.setZ(maximum.getZ()),
+ maximum.setX(minimum.getX()),
+ maximum.setY(minimum.getY()),
+ maximum.setZ(minimum.getZ()) };
+
+ for (int i = 0; i < corners.length; i++) {
+ corners[i] = transformAround.apply(corners[i]);
+ }
+
+ Vector newMinimum = corners[0];
+ Vector newMaximum = corners[0];
+
+ for (int i = 1; i < corners.length; i++) {
+ newMinimum = Vector.getMinimum(newMinimum, corners[i]);
+ newMaximum = Vector.getMaximum(newMaximum, corners[i]);
+ }
+
+ // After transformation, the points may not really sit on a block,
+ // so we should expand the region for edge cases
+ newMinimum = newMinimum.setX(Math.floor(newMinimum.getX()));
+ newMinimum = newMinimum.setY(Math.floor(newMinimum.getY()));
+ newMinimum = newMinimum.setZ(Math.floor(newMinimum.getZ()));
+
+ newMaximum = newMaximum.setX(Math.ceil(newMaximum.getX()));
+ newMaximum = newMaximum.setY(Math.ceil(newMaximum.getY()));
+ newMaximum = newMaximum.setZ(Math.ceil(newMaximum.getZ()));
+
+ return new CuboidRegion(newMinimum, newMaximum);
+ }
+
+ /**
+ * Create an operation to copy from the original clipboard to the given extent.
+ *
+ * @param target the target
+ * @return the operation
+ */
+ public Operation copyTo(Extent target) {
+ BlockTransformExtent extent = new BlockTransformExtent(original, transform, worldData.getBlockRegistry());
+ ForwardExtentCopy copy = new ForwardExtentCopy(extent, original.getRegion(), original.getOrigin(), target, original.getOrigin());
+ copy.setTransform(transform);
+ return copy;
+ }
+
+ /**
+ * Create a new instance to bake the transform with.
+ *
+ * @param original the original clipboard
+ * @param transform the transform
+ * @param worldData the world data instance
+ * @return a builder
+ */
+ public static FlattenedClipboardTransform transform(Clipboard original, Transform transform, WorldData worldData) {
+ return new FlattenedClipboardTransform(original, transform, worldData);
+ }
+
+}
diff --git a/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java b/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java
index ffce9f7ec..09abf3b99 100644
--- a/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java
+++ b/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java
@@ -22,7 +22,11 @@ package com.sk89q.worldedit.command;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.Logging;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.Patterns;
@@ -35,6 +39,7 @@ import com.sk89q.worldedit.util.command.binding.Range;
import com.sk89q.worldedit.util.command.binding.Switch;
import com.sk89q.worldedit.util.command.binding.Text;
import com.sk89q.worldedit.util.command.parametric.Optional;
+import com.sk89q.worldedit.world.biome.BaseBiome;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.minecraft.util.commands.Logging.LogMode.*;
@@ -332,7 +337,7 @@ public class GenerationCommands {
@Logging(ALL)
public void generateBiome(Player player, LocalSession session, EditSession editSession,
@Selection Region region,
- BiomeType target,
+ BaseBiome target,
@Text String expression,
@Switch('h') boolean hollow,
@Switch('r') boolean useRawCoords,
@@ -368,7 +373,7 @@ public class GenerationCommands {
try {
final int affected = editSession.makeBiomeShape(region, zero, unit, target, expression, hollow);
player.findFreePosition();
- player.print("Biome changed to " + target.getName() + ". " + affected + " columns affected.");
+ player.print("" + affected + " columns affected.");
} catch (ExpressionException e) {
player.printError(e.getMessage());
}
diff --git a/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
index 2b0d25526..67e8ba20f 100644
--- a/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
+++ b/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
@@ -19,18 +19,42 @@
package com.sk89q.worldedit.command;
-import com.sk89q.minecraft.util.commands.*;
-import com.sk89q.worldedit.*;
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.FilenameException;
+import com.sk89q.worldedit.FilenameResolutionException;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.schematic.SchematicFormat;
-import com.sk89q.worldedit.world.DataException;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.math.transform.Transform;
+import com.sk89q.worldedit.session.ClipboardHolder;
+import com.sk89q.worldedit.util.io.Closer;
+import com.sk89q.worldedit.util.command.parametric.Optional;
+import com.sk89q.worldedit.world.registry.WorldData;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -39,6 +63,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class SchematicCommands {
+ private static final Logger log = Logger.getLogger(SchematicCommands.class.getCanonicalName());
private final WorldEdit worldEdit;
/**
@@ -52,113 +77,94 @@ public class SchematicCommands {
}
@Command(
- aliases = { "load", "l" },
- usage = "[format] ",
- desc = "Load a file into your clipboard",
- help = "Load a schematic file into your clipboard\n" +
- "Format is a format from \"//schematic formats\"\n" +
- "If the format is not provided, WorldEdit will\n" +
- "attempt to automatically detect the format of the schematic",
- flags = "f",
- min = 1,
- max = 2
+ aliases = { "load" },
+ usage = "[] ",
+ desc = "Load a schematic into your clipboard"
)
- @CommandPermissions({"worldedit.clipboard.load", "worldedit.schematic.load"}) // TODO: Remove 'clipboard' perm
- public void load(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException {
-
+ @Deprecated
+ @CommandPermissions({ "worldedit.clipboard.load", "worldedit.schematic.load" })
+ public void load(Player player, LocalSession session, @Optional("schematic") String formatName, String filename) throws FilenameException {
LocalConfiguration config = worldEdit.getConfiguration();
- String fileName;
- String formatName;
- if (args.argsLength() == 1) {
- formatName = null;
- fileName = args.getString(0);
- } else {
- formatName = args.getString(0);
- fileName = args.getString(1);
- }
File dir = worldEdit.getWorkingDirectoryFile(config.saveDir);
- File f = worldEdit.getSafeOpenFile(player, dir, fileName, "schematic", "schematic");
+ File f = worldEdit.getSafeOpenFile(player, dir, filename, "schematic", "schematic");
if (!f.exists()) {
- player.printError("Schematic " + fileName + " does not exist!");
+ player.printError("Schematic " + filename + " does not exist!");
return;
}
- SchematicFormat format = formatName == null ? null : SchematicFormat.getFormat(formatName);
- if (format == null) {
- format = SchematicFormat.getFormat(f);
- }
-
+ ClipboardFormat format = ClipboardFormat.findByAlias(formatName);
if (format == null) {
player.printError("Unknown schematic format: " + formatName);
return;
}
- if (!format.isOfFormat(f) && !args.hasFlag('f')) {
- player.printError(fileName + " is not of the " + format.getName() + " schematic format!");
- return;
- }
-
+ Closer closer = Closer.create();
try {
String filePath = f.getCanonicalPath();
String dirPath = dir.getCanonicalPath();
if (!filePath.substring(0, dirPath.length()).equals(dirPath)) {
- player.printError("Schematic could not read or it does not exist.");
+ player.printError("Clipboard file could not read or it does not exist.");
} else {
- session.setClipboard(format.load(f));
- WorldEdit.logger.info(player.getName() + " loaded " + filePath);
- player.print(fileName + " loaded. Paste it with //paste");
+ FileInputStream fis = closer.register(new FileInputStream(f));
+ BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
+ ClipboardReader reader = format.getReader(bis);
+
+ WorldData worldData = player.getWorld().getWorldData();
+ Clipboard clipboard = reader.read(player.getWorld().getWorldData());
+ session.setClipboard(new ClipboardHolder(clipboard, worldData));
+
+ log.info(player.getName() + " loaded " + filePath);
+ player.print(filename + " loaded. Paste it with //paste");
}
- } catch (DataException e) {
- player.printError("Load error: " + e.getMessage());
} catch (IOException e) {
player.printError("Schematic could not read or it does not exist: " + e.getMessage());
+ log.log(Level.WARNING, "Failed to load a saved clipboard", e);
+ } finally {
+ try {
+ closer.close();
+ } catch (IOException ignored) {
+ }
}
}
@Command(
- aliases = { "save", "s" },
- usage = "[format] ",
- desc = "Save your clipboard to file",
- help = "Save your clipboard to file\n" +
- "Format is a format from \"//schematic formats\"\n",
- min = 1,
- max = 2
+ aliases = { "save" },
+ usage = "[] ",
+ desc = "Save a schematic into your clipboard"
)
- @CommandPermissions({"worldedit.clipboard.save", "worldedit.schematic.save"}) // TODO: Remove 'clipboard' perm
- public void save(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException, CommandException {
-
+ @Deprecated
+ @CommandPermissions({ "worldedit.clipboard.save", "worldedit.schematic.save" })
+ public void save(Player player, LocalSession session, @Optional("schematic") String formatName, String filename) throws CommandException, WorldEditException {
LocalConfiguration config = worldEdit.getConfiguration();
- SchematicFormat format;
- if (args.argsLength() == 1) {
- if (SchematicFormat.getFormats().size() == 1) {
- format = SchematicFormat.getFormats().iterator().next();
- } else {
- player.printError("More than one schematic format is available. Please provide the desired format");
- return;
- }
- } else {
- format = SchematicFormat.getFormat(args.getString(0));
- if (format == null) {
- player.printError("Unknown schematic format: " + args.getString(0));
- return;
- }
- }
-
- String filename = args.getString(args.argsLength() - 1);
File dir = worldEdit.getWorkingDirectoryFile(config.saveDir);
File f = worldEdit.getSafeSaveFile(player, dir, filename, "schematic", "schematic");
- if (!dir.exists()) {
- if (!dir.mkdir()) {
- player.printError("The storage folder could not be created.");
- return;
- }
+ ClipboardFormat format = ClipboardFormat.findByAlias(formatName);
+ if (format == null) {
+ player.printError("Unknown schematic format: " + formatName);
+ return;
}
+ ClipboardHolder holder = session.getClipboard();
+ Clipboard clipboard = holder.getClipboard();
+ Transform transform = holder.getTransform();
+ Clipboard target;
+
+ // If we have a transform, bake it into the copy
+ if (!transform.isIdentity()) {
+ FlattenedClipboardTransform result = FlattenedClipboardTransform.transform(clipboard, transform, holder.getWorldData());
+ target = new BlockArrayClipboard(result.getTransformedRegion());
+ target.setOrigin(clipboard.getOrigin());
+ Operations.completeLegacy(result.copyTo(target));
+ } else {
+ target = clipboard;
+ }
+
+ Closer closer = Closer.create();
try {
// Create parent directories
File parent = f.getParentFile();
@@ -168,13 +174,20 @@ public class SchematicCommands {
}
}
- format.save(session.getClipboard(), f);
- WorldEdit.logger.info(player.getName() + " saved " + f.getCanonicalPath());
+ FileOutputStream fos = closer.register(new FileOutputStream(f));
+ BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
+ ClipboardWriter writer = closer.register(format.getWriter(bos));
+ writer.write(target, holder.getWorldData());
+ log.info(player.getName() + " saved " + f.getCanonicalPath());
player.print(filename + " saved.");
- } catch (DataException se) {
- player.printError("Save error: " + se.getMessage());
} catch (IOException e) {
player.printError("Schematic could not written: " + e.getMessage());
+ log.log(Level.WARNING, "Failed to write a saved clipboard", e);
+ } finally {
+ try {
+ closer.close();
+ } catch (IOException ignored) {
+ }
}
}
@@ -215,13 +228,13 @@ public class SchematicCommands {
)
@CommandPermissions("worldedit.schematic.formats")
public void formats(Actor actor) throws WorldEditException {
- actor.print("Available schematic formats (Name: Lookup names)");
+ actor.print("Available clipboard formats (Name: Lookup names)");
StringBuilder builder;
boolean first = true;
- for (SchematicFormat format : SchematicFormat.getFormats()) {
+ for (ClipboardFormat format : ClipboardFormat.values()) {
builder = new StringBuilder();
- builder.append(format.getName()).append(": ");
- for (String lookupName : format.getLookupNames()) {
+ builder.append(format.name()).append(": ");
+ for (String lookupName : format.getAliases()) {
if (!first) {
builder.append(", ");
}
@@ -292,9 +305,8 @@ public class SchematicCommands {
}
build.append("\n\u00a79");
- SchematicFormat format = SchematicFormat.getFormat(file);
- build.append(prefix).append(file.getName())
- .append(": ").append(format == null ? "Unknown" : format.getName());
+ ClipboardFormat format = ClipboardFormat.findByFile(file);
+ build.append(prefix).append(file.getName()).append(": ").append(format == null ? "Unknown" : format.name());
}
return build.toString();
}
diff --git a/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java b/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
index ba5144f9e..4d8d165dc 100644
--- a/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
+++ b/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
@@ -21,9 +21,9 @@ package com.sk89q.worldedit.command;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.Logging;
-import com.sk89q.worldedit.CuboidClipboard;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.Vector;
@@ -33,6 +33,7 @@ import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionOperationException;
import com.sk89q.worldedit.regions.RegionSelector;
@@ -43,6 +44,7 @@ import com.sk89q.worldedit.regions.selector.EllipsoidRegionSelector;
import com.sk89q.worldedit.regions.selector.ExtendingCuboidRegionSelector;
import com.sk89q.worldedit.regions.selector.Polygonal2DRegionSelector;
import com.sk89q.worldedit.regions.selector.SphereRegionSelector;
+import com.sk89q.worldedit.session.ClipboardHolder;
import com.sk89q.worldedit.util.Countable;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.storage.ChunkStore;
@@ -582,15 +584,16 @@ public class SelectionCommands {
public void size(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException {
if (args.hasFlag('c')) {
- CuboidClipboard clipboard = session.getClipboard();
- Vector size = clipboard.getSize();
- Vector offset = clipboard.getOffset();
+ ClipboardHolder holder = session.getClipboard();
+ Clipboard clipboard = holder.getClipboard();
+ Region region = clipboard.getRegion();
+ Vector size = region.getMaximumPoint().subtract(region.getMinimumPoint());
+ Vector origin = clipboard.getOrigin();
- player.print("Size: " + size);
- player.print("Offset: " + offset);
+ player.print("Cuboid dimensions (max - min): " + size);
+ player.print("Offset: " + origin);
player.print("Cuboid distance: " + size.distance(Vector.ONE));
- player.print("# of blocks: "
- + (int) (size.getX() * size.getY() * size.getZ()));
+ player.print("# of blocks: " + (int) (size.getX() * size.getY() * size.getZ()));
return;
}
@@ -608,8 +611,7 @@ public class SelectionCommands {
}
player.print("Size: " + size);
- player.print("Cuboid distance: " + region.getMaximumPoint()
- .distance(region.getMinimumPoint()));
+ player.print("Cuboid distance: " + region.getMaximumPoint().distance(region.getMinimumPoint()));
player.print("# of blocks: " + region.getArea());
}
@@ -653,7 +655,7 @@ public class SelectionCommands {
max = 0
)
@CommandPermissions("worldedit.analysis.distr")
- public void distr(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException {
+ public void distr(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException, CommandException {
int size;
boolean useData = args.hasFlag('d');
@@ -661,13 +663,8 @@ public class SelectionCommands {
List> distributionData = null;
if (args.hasFlag('c')) {
- CuboidClipboard clip = session.getClipboard();
- if (useData) {
- distributionData = clip.getBlockDistributionWithData();
- } else {
- distribution = clip.getBlockDistribution();
- }
- size = clip.getHeight() * clip.getLength() * clip.getWidth();
+ // TODO: Update for new clipboard
+ throw new CommandException("Needs to be re-written again");
} else {
if (useData) {
distributionData = editSession.getBlockDistributionWithData(session.getSelection(player.getWorld()));
diff --git a/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java b/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
index d1e0852d8..5dd5cce8d 100644
--- a/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
+++ b/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
@@ -26,30 +26,35 @@ import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.Logging;
import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.EntityType;
import com.sk89q.worldedit.LocalConfiguration;
import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.LocalWorld.KillFlags;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.command.util.CreatureButcher;
+import com.sk89q.worldedit.command.util.EntityRemover;
+import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.CommandManager;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.function.visitor.EntityVisitor;
import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.internal.expression.ExpressionException;
import com.sk89q.worldedit.internal.expression.runtime.EvaluationException;
import com.sk89q.worldedit.patterns.Pattern;
import com.sk89q.worldedit.patterns.SingleBlockPattern;
import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.CylinderRegion;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.util.command.CommandCallable;
import com.sk89q.worldedit.util.command.CommandMapping;
import com.sk89q.worldedit.util.command.Dispatcher;
import com.sk89q.worldedit.util.command.PrimaryAliasComparator;
import com.sk89q.worldedit.util.command.binding.Text;
-import com.sk89q.worldedit.util.command.parametric.Optional;
import com.sk89q.worldedit.util.formatting.ColorCodeBuilder;
import com.sk89q.worldedit.util.formatting.Style;
import com.sk89q.worldedit.util.formatting.StyledFragment;
@@ -374,7 +379,7 @@ public class UtilityCommands {
" -b also kills ambient mobs.\n" +
" -t also kills mobs with name tags.\n" +
" -f compounds all previous flags.\n" +
- " -l strikes lightning on each killed mob.",
+ " -l currently does nothing.",
min = 0,
max = 1
)
@@ -399,26 +404,37 @@ public class UtilityCommands {
}
}
- FlagContainer flags = new FlagContainer(actor);
- flags.or(KillFlags.FRIENDLY , args.hasFlag('f')); // No permission check here. Flags will instead be filtered by the subsequent calls.
- flags.or(KillFlags.PETS , args.hasFlag('p'), "worldedit.butcher.pets");
- flags.or(KillFlags.NPCS , args.hasFlag('n'), "worldedit.butcher.npcs");
- flags.or(KillFlags.GOLEMS , args.hasFlag('g'), "worldedit.butcher.golems");
- flags.or(KillFlags.ANIMALS , args.hasFlag('a'), "worldedit.butcher.animals");
- flags.or(KillFlags.AMBIENT , args.hasFlag('b'), "worldedit.butcher.ambient");
- flags.or(KillFlags.TAGGED , args.hasFlag('t'), "worldedit.butcher.tagged");
- flags.or(KillFlags.WITH_LIGHTNING, args.hasFlag('l'), "worldedit.butcher.lightning");
- // If you add flags here, please add them to com.sk89q.worldedit.commands.BrushCommands.butcherBrush() as well
+ CreatureButcher flags = new CreatureButcher(actor);
+ flags.fromCommand(args);
+
+ List visitors = new ArrayList();
+ LocalSession session = null;
+ EditSession editSession = null;
- int killed;
if (player != null) {
- LocalSession session = we.getSessionManager().get(player);
- killed = player.getWorld().killMobs(session.getPlacementPosition(player), radius, flags.flags);
- } else {
- killed = 0;
- for (World world : we.getServer().getWorlds()) {
- killed += world.killMobs(new Vector(), radius, flags.flags);
+ session = we.getSessionManager().get(player);
+ Vector center = session.getPlacementPosition(player);
+ editSession = session.createEditSession(player);
+ List entities;
+ if (radius >= 0) {
+ CylinderRegion region = CylinderRegion.createRadius(editSession, center, radius);
+ entities = editSession.getEntities(region);
+ } else {
+ entities = editSession.getEntities();
}
+ visitors.add(new EntityVisitor(entities.iterator(), flags.createFunction(editSession.getWorld().getWorldData().getEntityRegistry())));
+ } else {
+ Platform platform = we.getPlatformManager().queryCapability(Capability.WORLD_EDITING);
+ for (World world : platform.getWorlds()) {
+ List entities = world.getEntities();
+ visitors.add(new EntityVisitor(entities.iterator(), flags.createFunction(world.getWorldData().getEntityRegistry())));
+ }
+ }
+
+ int killed = 0;
+ for (EntityVisitor visitor : visitors) {
+ Operations.completeLegacy(visitor);
+ killed += visitor.getAffected();
}
if (radius < 0) {
@@ -426,25 +442,10 @@ public class UtilityCommands {
} else {
actor.print("Killed " + killed + " mobs in a radius of " + radius + ".");
}
- }
- public static class FlagContainer {
- private final Actor player;
- public int flags = 0;
- public FlagContainer(Actor player) {
- this.player = player;
- }
-
- public void or(int flag, boolean on) {
- if (on) flags |= flag;
- }
-
- public void or(int flag, boolean on, String permission) {
- or(flag, on);
-
- if ((flags & flag) != 0 && !player.hasPermission(permission)) {
- flags &= ~flag;
- }
+ if (editSession != null) {
+ session.remember(editSession);
+ editSession.flushQueue();
}
}
@@ -457,56 +458,55 @@ public class UtilityCommands {
)
@CommandPermissions("worldedit.remove")
@Logging(PLACEMENT)
- public void remove(Actor actor, @Optional Player player, @Optional LocalSession session, CommandContext args) throws WorldEditException {
-
+ public void remove(Actor actor, CommandContext args) throws WorldEditException, CommandException {
String typeStr = args.getString(0);
int radius = args.getInteger(1);
+ Player player = actor instanceof Player ? (Player) actor : null;
if (radius < -1) {
actor.printError("Use -1 to remove all entities in loaded chunks");
return;
}
- EntityType type = null;
+ EntityRemover remover = new EntityRemover();
+ remover.fromString(typeStr);
- if (typeStr.matches("all")) {
- type = EntityType.ALL;
- } else if (typeStr.matches("projectiles?|arrows?")) {
- type = EntityType.PROJECTILES;
- } else if (typeStr.matches("items?")
- || typeStr.matches("drops?")) {
- type = EntityType.ITEMS;
- } else if (typeStr.matches("falling(blocks?|sand|gravel)")) {
- type = EntityType.FALLING_BLOCKS;
- } else if (typeStr.matches("paintings?")
- || typeStr.matches("art")) {
- type = EntityType.PAINTINGS;
- } else if (typeStr.matches("(item)frames?")) {
- type = EntityType.ITEM_FRAMES;
- } else if (typeStr.matches("boats?")) {
- type = EntityType.BOATS;
- } else if (typeStr.matches("minecarts?")
- || typeStr.matches("carts?")) {
- type = EntityType.MINECARTS;
- } else if (typeStr.matches("tnt")) {
- type = EntityType.TNT;
- } else if (typeStr.matches("xp")) {
- type = EntityType.XP_ORBS;
+ List visitors = new ArrayList();
+ LocalSession session = null;
+ EditSession editSession = null;
+
+ if (player != null) {
+ session = we.getSessionManager().get(player);
+ Vector center = session.getPlacementPosition(player);
+ editSession = session.createEditSession(player);
+ List entities;
+ if (radius >= 0) {
+ CylinderRegion region = CylinderRegion.createRadius(editSession, center, radius);
+ entities = editSession.getEntities(region);
+ } else {
+ entities = editSession.getEntities();
+ }
+ visitors.add(new EntityVisitor(entities.iterator(), remover.createFunction(editSession.getWorld().getWorldData().getEntityRegistry())));
} else {
- actor.printError("Acceptable types: projectiles, items, paintings, itemframes, boats, minecarts, tnt, xp, or all");
- return;
+ Platform platform = we.getPlatformManager().queryCapability(Capability.WORLD_EDITING);
+ for (World world : platform.getWorlds()) {
+ List entities = world.getEntities();
+ visitors.add(new EntityVisitor(entities.iterator(), remover.createFunction(world.getWorldData().getEntityRegistry())));
+ }
}
int removed = 0;
- if (player != null) {
- Vector origin = session.getPlacementPosition(player);
- removed = player.getWorld().removeEntities(type, origin, radius);
- } else {
- for (World world : we.getServer().getWorlds()) {
- removed += world.removeEntities(type, new Vector(), radius);
- }
+ for (EntityVisitor visitor : visitors) {
+ Operations.completeLegacy(visitor);
+ removed += visitor.getAffected();
+ }
+
+ actor.print("Marked " + (removed != 1 ? "entities" : "entity") + " for removal.");
+
+ if (editSession != null) {
+ session.remember(editSession);
+ editSession.flushQueue();
}
- player.print("Marked " + removed + " entit(ies) for removal.");
}
@Command(
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java b/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java
index fffa9a0be..04a25443a 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java
@@ -25,6 +25,7 @@ import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.world.World;
/**
* A super pickaxe mode that will remove blocks in an area.
@@ -48,7 +49,7 @@ public class AreaPickaxe implements BlockTool {
int ox = clicked.getBlockX();
int oy = clicked.getBlockY();
int oz = clicked.getBlockZ();
- int initialType = clicked.getWorld().getBlockType(clicked.toVector());
+ int initialType = ((World) clicked.getExtent()).getBlockType(clicked.toVector());
if (initialType == 0) {
return true;
@@ -70,7 +71,7 @@ public class AreaPickaxe implements BlockTool {
continue;
}
- clicked.getWorld().queueBlockBreakEffect(server, pos, initialType, clicked.toVector().distanceSq(pos));
+ ((World) clicked.getExtent()).queueBlockBreakEffect(server, pos, initialType, clicked.toVector().distanceSq(pos));
editSession.setBlock(pos, air);
}
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java b/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java
index 252823561..41bff5f2a 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java
@@ -41,7 +41,7 @@ public class BlockDataCyler implements DoubleActionBlockTool {
private boolean handleCycle(Platform server, LocalConfiguration config,
Player player, LocalSession session, Location clicked, boolean forward) {
- World world = clicked.getWorld();
+ World world = (World) clicked.getExtent();
int type = world.getBlockType(clicked.toVector());
int data = world.getBlockData(clicked.toVector());
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java b/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
index 19abb8ea3..d1af045bb 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java
@@ -48,7 +48,7 @@ public class BlockReplacer implements DoubleActionBlockTool {
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
BlockBag bag = session.getBlockBag(player);
- World world = clicked.getWorld();
+ World world = (World) clicked.getExtent();
EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1, bag, player);
try {
@@ -67,7 +67,7 @@ BlockBag bag = session.getBlockBag(player);
@Override
public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
- World world = clicked.getWorld();
+ World world = (World) clicked.getExtent();
EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1, player);
targetBlock = (editSession).getBlock(clicked.toVector());
BlockType type = BlockType.fromID(targetBlock.getType());
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java b/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
index df92fb5f0..14785c392 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
@@ -53,7 +53,7 @@ public class FloatingTreeRemover implements BlockTool {
public boolean actPrimary(Platform server, LocalConfiguration config,
Player player, LocalSession session, Location clicked) {
- final World world = clicked.getWorld();
+ final World world = (World) clicked.getExtent();
switch (world.getBlockType(clicked.toVector())) {
case BlockID.LOG:
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java b/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
index 4ccead8cf..3d484b18e 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
@@ -51,7 +51,7 @@ public class FloodFillTool implements BlockTool {
@Override
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
- World world = clicked.getWorld();
+ World world = (World) clicked.getExtent();
int initialType = world.getBlockType(clicked.toVector());
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java b/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
index a68031f74..6aa5262a0 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
@@ -42,7 +42,7 @@ public class QueryTool implements BlockTool {
@Override
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
- World world = clicked.getWorld();
+ World world = (World) clicked.getExtent();
EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, 0, player);
BaseBlock block = (editSession).rawGetBlock(clicked.toVector());
BlockType type = BlockType.fromID(block.getType());
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java b/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
index e551b9f2e..7a8589b4c 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java
@@ -50,7 +50,7 @@ public class RecursivePickaxe implements BlockTool {
@Override
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
- World world = clicked.getWorld();
+ World world = (World) clicked.getExtent();
int initialType = world.getBlockType(clicked.toVector());
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java b/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java
index 202c04c95..246a6f633 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java
@@ -42,7 +42,7 @@ public class SinglePickaxe implements BlockTool {
@Override
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
- World world = clicked.getWorld();
+ World world = (World) clicked.getExtent();
final int blockType = world.getBlockType(clicked.toVector());
if (blockType == BlockID.BEDROCK
&& !player.canDestroyBedrock()) {
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/brush/ButcherBrush.java b/src/main/java/com/sk89q/worldedit/command/tool/brush/ButcherBrush.java
index 1a8e4f9cd..637be6d2f 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/brush/ButcherBrush.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/brush/ButcherBrush.java
@@ -22,19 +22,28 @@ package com.sk89q.worldedit.command.tool.brush;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.command.util.CreatureButcher;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.function.operation.Operations;
import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.function.visitor.EntityVisitor;
+import com.sk89q.worldedit.regions.CylinderRegion;
+
+import java.util.List;
public class ButcherBrush implements Brush {
- private int flags;
+ private CreatureButcher flags;
- public ButcherBrush(int flags) {
+ public ButcherBrush(CreatureButcher flags) {
this.flags = flags;
}
@Override
public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException {
- editSession.getWorld().killMobs(pos, size, flags);
+ CylinderRegion region = CylinderRegion.createRadius(editSession, pos, size);
+ List entities = editSession.getEntities(region);
+ Operations.completeLegacy(new EntityVisitor(entities.iterator(), flags.createFunction(editSession.getWorld().getWorldData().getEntityRegistry())));
}
}
diff --git a/src/main/java/com/sk89q/worldedit/command/tool/brush/ClipboardBrush.java b/src/main/java/com/sk89q/worldedit/command/tool/brush/ClipboardBrush.java
index ef5fffbcc..7f772239d 100644
--- a/src/main/java/com/sk89q/worldedit/command/tool/brush/ClipboardBrush.java
+++ b/src/main/java/com/sk89q/worldedit/command/tool/brush/ClipboardBrush.java
@@ -19,24 +19,41 @@
package com.sk89q.worldedit.command.tool.brush;
-import com.sk89q.worldedit.CuboidClipboard;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.function.operation.Operations;
import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.session.ClipboardHolder;
public class ClipboardBrush implements Brush {
- private CuboidClipboard clipboard;
- private boolean noAir;
+ private ClipboardHolder holder;
+ private boolean ignoreAirBlocks;
+ private boolean usingOrigin;
- public ClipboardBrush(CuboidClipboard clipboard, boolean noAir) {
- this.clipboard = clipboard;
- this.noAir = noAir;
+ public ClipboardBrush(ClipboardHolder holder, boolean ignoreAirBlocks, boolean usingOrigin) {
+ this.holder = holder;
+ this.ignoreAirBlocks = ignoreAirBlocks;
+ this.usingOrigin = usingOrigin;
}
+ @Override
public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException {
- clipboard.place(editSession, pos.subtract(clipboard.getSize().divide(2)), noAir);
+ Clipboard clipboard = holder.getClipboard();
+ Region region = clipboard.getRegion();
+ Vector centerOffset = region.getCenter().subtract(clipboard.getOrigin());
+
+ Operation operation = holder
+ .createPaste(editSession, editSession.getWorld().getWorldData())
+ .to(usingOrigin ? pos : pos.subtract(centerOffset))
+ .ignoreAirBlocks(ignoreAirBlocks)
+ .build();
+
+ Operations.completeLegacy(operation);
}
}
diff --git a/src/main/java/com/sk89q/worldedit/command/util/CreatureButcher.java b/src/main/java/com/sk89q/worldedit/command/util/CreatureButcher.java
new file mode 100644
index 000000000..822389bbe
--- /dev/null
+++ b/src/main/java/com/sk89q/worldedit/command/util/CreatureButcher.java
@@ -0,0 +1,135 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.command.util;
+
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.entity.metadata.EntityType;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.function.EntityFunction;
+import com.sk89q.worldedit.world.registry.EntityRegistry;
+
+/**
+ * The implementation of /butcher.
+ */
+public class CreatureButcher {
+
+ final class Flags {
+ @SuppressWarnings("PointlessBitwiseExpression")
+ public static final int PETS = 1 << 0;
+ public static final int NPCS = 1 << 1;
+ public static final int ANIMALS = 1 << 2;
+ public static final int GOLEMS = 1 << 3;
+ public static final int AMBIENT = 1 << 4;
+ public static final int TAGGED = 1 << 5;
+ public static final int FRIENDLY = PETS | NPCS | ANIMALS | GOLEMS | AMBIENT | TAGGED;
+ public static final int WITH_LIGHTNING = 1 << 20;
+
+ private Flags() {
+ }
+ }
+
+ private final Actor player;
+ public int flags = 0;
+
+ public CreatureButcher(Actor player) {
+ this.player = player;
+ }
+
+ public void or(int flag, boolean on) {
+ if (on) flags |= flag;
+ }
+
+ public void or(int flag, boolean on, String permission) {
+ or(flag, on);
+
+ if ((flags & flag) != 0 && !player.hasPermission(permission)) {
+ flags &= ~flag;
+ }
+ }
+
+ public void fromCommand(CommandContext args) {
+ or(Flags.FRIENDLY , args.hasFlag('f')); // No permission check here. Flags will instead be filtered by the subsequent calls.
+ or(Flags.PETS , args.hasFlag('p'), "worldedit.butcher.pets");
+ or(Flags.NPCS , args.hasFlag('n'), "worldedit.butcher.npcs");
+ or(Flags.GOLEMS , args.hasFlag('g'), "worldedit.butcher.golems");
+ or(Flags.ANIMALS , args.hasFlag('a'), "worldedit.butcher.animals");
+ or(Flags.AMBIENT , args.hasFlag('b'), "worldedit.butcher.ambient");
+ or(Flags.TAGGED , args.hasFlag('t'), "worldedit.butcher.tagged");
+ or(Flags.WITH_LIGHTNING, args.hasFlag('l'), "worldedit.butcher.lightning");
+ }
+
+ public EntityFunction createFunction(final EntityRegistry entityRegistry) {
+ return new EntityFunction() {
+ @Override
+ public boolean apply(Entity entity) throws WorldEditException {
+ boolean killPets = (flags & Flags.PETS) != 0;
+ boolean killNPCs = (flags & Flags.NPCS) != 0;
+ boolean killAnimals = (flags & Flags.ANIMALS) != 0;
+ boolean killGolems = (flags & Flags.GOLEMS) != 0;
+ boolean killAmbient = (flags & Flags.AMBIENT) != 0;
+ boolean killTagged = (flags & Flags.TAGGED) != 0;
+
+ EntityType type = entity.getFacet(EntityType.class);
+
+ if (type == null) {
+ return false;
+ }
+
+ if (type.isPlayerDerived()) {
+ return false;
+ }
+
+ if (!type.isLiving()) {
+ return false;
+ }
+
+ if (!killAnimals && type.isAnimal()) {
+ return false;
+ }
+
+ if (!killPets && type.isTamed()) {
+ return false;
+ }
+
+ if (!killGolems && type.isGolem()) {
+ return false;
+ }
+
+ if (!killNPCs && type.isNPC()) {
+ return false;
+ }
+
+ if (!killAmbient && type.isAmbient()) {
+ return false;
+ }
+
+ if (!killTagged && type.isTagged()) {
+ return false;
+ }
+
+ entity.remove();
+ return true;
+ }
+ };
+ }
+
+}
diff --git a/src/main/java/com/sk89q/worldedit/command/util/EntityRemover.java b/src/main/java/com/sk89q/worldedit/command/util/EntityRemover.java
new file mode 100644
index 000000000..b6459b186
--- /dev/null
+++ b/src/main/java/com/sk89q/worldedit/command/util/EntityRemover.java
@@ -0,0 +1,160 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.command.util;
+
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.entity.metadata.EntityType;
+import com.sk89q.worldedit.function.EntityFunction;
+import com.sk89q.worldedit.world.registry.EntityRegistry;
+
+import javax.annotation.Nullable;
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * The implementation of /remove.
+ */
+public class EntityRemover {
+
+ public enum Type {
+ ALL("all") {
+ @Override
+ boolean matches(EntityType type) {
+ for (Type value : values()) {
+ if (value != this && value.matches(type)) {
+ return true;
+ }
+ }
+ return false;
+ }
+ },
+ PROJECTILES("projectiles?|arrows?") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isProjectile();
+ }
+ },
+ ITEMS("items?|drops?") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isItem();
+ }
+ },
+ FALLING_BLOCKS("falling(blocks?|sand|gravel)") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isFallingBlock();
+ }
+ },
+ PAINTINGS("paintings?|art") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isPainting();
+ }
+ },
+ ITEM_FRAMES("(item)frames?") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isItemFrame();
+ }
+ },
+ BOATS("boats?") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isBoat();
+ }
+ },
+ MINECARTS("(mine)?carts?") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isMinecart();
+ }
+ },
+ TNT("tnt") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isTNT();
+ }
+ },
+ XP_ORBS("xp") {
+ @Override
+ boolean matches(EntityType type) {
+ return type.isExperienceOrb();
+ }
+ };
+
+ private final Pattern pattern;
+
+ Type(String pattern) {
+ this.pattern = Pattern.compile(pattern);
+ }
+
+ public boolean matches(String str) {
+ return pattern.matcher(str).matches();
+ }
+
+ abstract boolean matches(EntityType type);
+
+ @Nullable
+ public static Type findByPattern(String str) {
+ for (Type type : values()) {
+ if (type.matches(str)) {
+ return type;
+ }
+ }
+
+ return null;
+ }
+ }
+
+ private Type type;
+
+ public void fromString(String str) throws CommandException {
+ Type type = Type.findByPattern(str);
+ if (type != null) {
+ this.type = type;
+ } else {
+ throw new CommandException("Acceptable types: projectiles, items, paintings, itemframes, boats, minecarts, tnt, xp, or all");
+ }
+ }
+
+ public EntityFunction createFunction(final EntityRegistry entityRegistry) {
+ final Type type = this.type;
+ checkNotNull("type can't be null", type);
+ return new EntityFunction() {
+ @Override
+ public boolean apply(Entity entity) throws WorldEditException {
+ EntityType registryType = entity.getFacet(EntityType.class);
+ if (registryType != null) {
+ if (type.matches(registryType)) {
+ entity.remove();
+ return true;
+ }
+ }
+
+ return false;
+ }
+ };
+ }
+
+}
diff --git a/src/main/java/com/sk89q/worldedit/entity/BaseEntity.java b/src/main/java/com/sk89q/worldedit/entity/BaseEntity.java
index 2cb248a69..4f6c40731 100644
--- a/src/main/java/com/sk89q/worldedit/entity/BaseEntity.java
+++ b/src/main/java/com/sk89q/worldedit/entity/BaseEntity.java
@@ -20,14 +20,8 @@
package com.sk89q.worldedit.entity;
import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.StringTag;
-import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.world.DataException;
import com.sk89q.worldedit.world.NbtValued;
-import java.util.HashMap;
-import java.util.Map;
-
import static com.google.common.base.Preconditions.checkNotNull;
/**
@@ -35,52 +29,43 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class BaseEntity implements NbtValued {
+ private String id;
private CompoundTag nbtData;
/**
- * Create a new entity with the given entity ID.
+ * Create a new base entity.
*
- * @param id the ID of the entity, which determines its type
+ * @param id the entity type ID
+ * @param nbtData NBT data
+ */
+ public BaseEntity(String id, CompoundTag nbtData) {
+ setTypeId(id);
+ setNbtData(nbtData);
+ }
+
+ /**
+ * Create a new base entity with no NBT data.
+ *
+ * @param id the entity type ID
*/
public BaseEntity(String id) {
- checkNotNull(id);
- Map map = new HashMap();
- map.put("id", new StringTag("id", id));
- this.nbtData = new CompoundTag("", map);
+ setTypeId(id);
}
/**
- * Create a new entity with the given NBT data.
+ * Make a clone of a {@link BaseEntity}.
*
- * @param nbtData the NBT data
+ * @param other the object to clone
*/
- public BaseEntity(CompoundTag nbtData) {
- checkNotNull(nbtData);
- this.nbtData = nbtData;
- }
-
- /**
- * Get the ID of the entity, which determines the type of entity.
- * An example of an entity ID would be "CaveSpider".
- *
- * @return the entity ID, which may be an empty string
- */
- public String getEntityId() {
- CompoundTag nbtData = getNbtData();
- if (nbtData == null) {
- return "";
- }
- Tag idTag = nbtData.getValue().get("id");
- if (idTag != null && idTag instanceof StringTag) {
- return ((StringTag) idTag).getValue();
- } else {
- return "";
- }
+ public BaseEntity(BaseEntity other) {
+ checkNotNull(other);
+ setTypeId(other.getTypeId());
+ setNbtData(other.getNbtData());
}
@Override
public boolean hasNbtData() {
- return getNbtData() != null;
+ return true;
}
@Override
@@ -89,9 +74,28 @@ public class BaseEntity implements NbtValued {
}
@Override
- public void setNbtData(CompoundTag nbtData) throws DataException {
+ public void setNbtData(CompoundTag nbtData) {
checkNotNull(nbtData);
this.nbtData = nbtData;
}
+ /**
+ * Get the entity that determines the type of entity.
+ *
+ * @return the entity ID
+ */
+ public String getTypeId() {
+ return id;
+ }
+
+ /**
+ * Set the entity ID that determines the type of entity.
+ *
+ * @param id the id
+ */
+ public void setTypeId(String id) {
+ checkNotNull(id);
+ this.id = id;
+ }
+
}
diff --git a/src/main/java/com/sk89q/worldedit/entity/Entity.java b/src/main/java/com/sk89q/worldedit/entity/Entity.java
index 950557bc3..4224e5de7 100644
--- a/src/main/java/com/sk89q/worldedit/entity/Entity.java
+++ b/src/main/java/com/sk89q/worldedit/entity/Entity.java
@@ -19,13 +19,11 @@
package com.sk89q.worldedit.entity;
-import com.sk89q.worldedit.PlayerDirection;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.WorldVector;
-import com.sk89q.worldedit.WorldVectorFace;
import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.util.Faceted;
import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.world.World;
+
+import javax.annotation.Nullable;
/**
* A reference to an instance of an entity that exists in an {@link Extent}
@@ -37,138 +35,15 @@ import com.sk89q.worldedit.world.World;
* can then be used to spawn new instances of that particular entity
* description.
*/
-public interface Entity {
+public interface Entity extends Faceted {
/**
- * Find a position for the actor to stand that is not inside a block.
- * Blocks above the player will be iteratively tested until there is
- * a series of two free blocks. The actor will be teleported to
- * that free position.
+ * Get a copy of the entity's state.
*
- * @param searchPos search position
+ * @return the entity's state or null if one cannot be gotten
*/
- void findFreePosition(WorldVector searchPos);
-
- /**
- * Set the actor on the ground.
- *
- * @param searchPos The location to start searching from
- */
- void setOnGround(WorldVector searchPos);
-
- /**
- * Find a position for the player to stand that is not inside a block.
- * Blocks above the player will be iteratively tested until there is
- * a series of two free blocks. The player will be teleported to
- * that free position.
- */
- void findFreePosition();
-
- /**
- * Go up one level to the next free space above.
- *
- * @return true if a spot was found
- */
- boolean ascendLevel();
-
- /**
- * Go up one level to the next free space above.
- *
- * @return true if a spot was found
- */
- boolean descendLevel();
-
- /**
- * Ascend to the ceiling above.
- *
- * @param clearance How many blocks to leave above the player's head
- * @return whether the player was moved
- */
- boolean ascendToCeiling(int clearance);
-
- /**
- * Ascend to the ceiling above.
- *
- * @param clearance How many blocks to leave above the player's head
- * @param alwaysGlass Always put glass under the player
- * @return whether the player was moved
- */
- boolean ascendToCeiling(int clearance, boolean alwaysGlass);
-
- /**
- * Just go up.
- *
- * @param distance How far up to teleport
- * @return whether the player was moved
- */
- boolean ascendUpwards(int distance);
-
- /**
- * Just go up.
- *
- * @param distance How far up to teleport
- * @param alwaysGlass Always put glass under the player
- * @return whether the player was moved
- */
- boolean ascendUpwards(int distance, boolean alwaysGlass);
-
- /**
- * Make the player float in the given blocks.
- *
- * @param x The X coordinate of the block to float in
- * @param y The Y coordinate of the block to float in
- * @param z The Z coordinate of the block to float in
- */
- void floatAt(int x, int y, int z, boolean alwaysGlass);
-
- /**
- * Get the point of the block that is being stood in.
- *
- * @return point
- */
- WorldVector getBlockIn();
-
- /**
- * Get the point of the block that is being stood upon.
- *
- * @return point
- */
- WorldVector getBlockOn();
-
- /**
- * Get the point of the block being looked at. May return null.
- * Will return the farthest away air block if useLastBlock is true and no other block is found.
- *
- * @param range How far to checks for blocks
- * @param useLastBlock Try to return the last valid air block found.
- * @return point
- */
- WorldVector getBlockTrace(int range, boolean useLastBlock);
-
- WorldVectorFace getBlockTraceFace(int range, boolean useLastBlock);
-
- /**
- * Get the point of the block being looked at. May return null.
- *
- * @param range How far to checks for blocks
- * @return point
- */
- WorldVector getBlockTrace(int range);
-
- /**
- * Get the point of the block being looked at. May return null.
- *
- * @param range How far to checks for blocks
- * @return point
- */
- WorldVector getSolidBlockTrace(int range);
-
- /**
- * Get the player's cardinal direction (N, W, NW, etc.). May return null.
- *
- * @return the direction
- */
- PlayerDirection getCardinalDirection();
+ @Nullable
+ BaseEntity getState();
/**
* Get the location of this entity.
@@ -178,57 +53,17 @@ public interface Entity {
Location getLocation();
/**
- * Get the actor's position.
- *
- * If the actor has no permission, then return a dummy location.
+ * Get the extent that this entity is on.
*
- * @return the actor's position
+ * @return the extent
*/
- WorldVector getPosition();
+ Extent getExtent();
/**
- * Get the player's view pitch.
+ * Remove this entity from it container.
*
- * @return pitch
+ * @return true if removal was successful
*/
- double getPitch();
-
- /**
- * Get the player's view yaw.
- *
- * @return yaw
- */
- double getYaw();
-
- /**
- * Pass through the wall that you are looking at.
- *
- * @param range How far to checks for blocks
- * @return whether the player was pass through
- */
- boolean passThroughForwardWall(int range);
-
- /**
- * Move the player.
- *
- * @param pos Where to move them
- * @param pitch The pitch (up/down) of the player's view
- * @param yaw The yaw (left/right) of the player's view
- */
- void setPosition(Vector pos, float pitch, float yaw);
-
- /**
- * Move the player.
- *
- * @param pos Where to move them
- */
- void setPosition(Vector pos);
-
- /**
- * Get the world that this entity is on.
- *
- * @return the world
- */
- World getWorld();
+ boolean remove();
}
diff --git a/src/main/java/com/sk89q/worldedit/entity/Player.java b/src/main/java/com/sk89q/worldedit/entity/Player.java
index 0098dc2f4..c5e2e333e 100644
--- a/src/main/java/com/sk89q/worldedit/entity/Player.java
+++ b/src/main/java/com/sk89q/worldedit/entity/Player.java
@@ -20,16 +20,27 @@
package com.sk89q.worldedit.entity;
import com.sk89q.worldedit.PlayerDirection;
+import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.WorldVector;
+import com.sk89q.worldedit.WorldVectorFace;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.inventory.BlockBag;
+import com.sk89q.worldedit.world.World;
/**
* A player.
*/
public interface Player extends Entity, Actor {
+ /**
+ * Return the world that the player is on.
+ *
+ * @return the world
+ */
+ World getWorld();
+
/**
* Returns true if the entity is holding a pick axe.
*
@@ -81,4 +92,182 @@ public interface Player extends Entity, Actor {
*/
boolean hasCreativeMode();
+ /**
+ * Find a position for the actor to stand that is not inside a block.
+ * Blocks above the player will be iteratively tested until there is
+ * a series of two free blocks. The actor will be teleported to
+ * that free position.
+ *
+ * @param searchPos search position
+ */
+ void findFreePosition(WorldVector searchPos);
+
+ /**
+ * Set the actor on the ground.
+ *
+ * @param searchPos The location to start searching from
+ */
+ void setOnGround(WorldVector searchPos);
+
+ /**
+ * Find a position for the player to stand that is not inside a block.
+ * Blocks above the player will be iteratively tested until there is
+ * a series of two free blocks. The player will be teleported to
+ * that free position.
+ */
+ void findFreePosition();
+
+ /**
+ * Go up one level to the next free space above.
+ *
+ * @return true if a spot was found
+ */
+ boolean ascendLevel();
+
+ /**
+ * Go up one level to the next free space above.
+ *
+ * @return true if a spot was found
+ */
+ boolean descendLevel();
+
+ /**
+ * Ascend to the ceiling above.
+ *
+ * @param clearance How many blocks to leave above the player's head
+ * @return whether the player was moved
+ */
+ boolean ascendToCeiling(int clearance);
+
+ /**
+ * Ascend to the ceiling above.
+ *
+ * @param clearance How many blocks to leave above the player's head
+ * @param alwaysGlass Always put glass under the player
+ * @return whether the player was moved
+ */
+ boolean ascendToCeiling(int clearance, boolean alwaysGlass);
+
+ /**
+ * Just go up.
+ *
+ * @param distance How far up to teleport
+ * @return whether the player was moved
+ */
+ boolean ascendUpwards(int distance);
+
+ /**
+ * Just go up.
+ *
+ * @param distance How far up to teleport
+ * @param alwaysGlass Always put glass under the player
+ * @return whether the player was moved
+ */
+ boolean ascendUpwards(int distance, boolean alwaysGlass);
+
+ /**
+ * Make the player float in the given blocks.
+ *
+ * @param x The X coordinate of the block to float in
+ * @param y The Y coordinate of the block to float in
+ * @param z The Z coordinate of the block to float in
+ */
+ void floatAt(int x, int y, int z, boolean alwaysGlass);
+
+ /**
+ * Get the point of the block that is being stood in.
+ *
+ * @return point
+ */
+ WorldVector getBlockIn();
+
+ /**
+ * Get the point of the block that is being stood upon.
+ *
+ * @return point
+ */
+ WorldVector getBlockOn();
+
+ /**
+ * Get the point of the block being looked at. May return null.
+ * Will return the farthest away air block if useLastBlock is true and no other block is found.
+ *
+ * @param range How far to checks for blocks
+ * @param useLastBlock Try to return the last valid air block found.
+ * @return point
+ */
+ WorldVector getBlockTrace(int range, boolean useLastBlock);
+
+ WorldVectorFace getBlockTraceFace(int range, boolean useLastBlock);
+
+ /**
+ * Get the point of the block being looked at. May return null.
+ *
+ * @param range How far to checks for blocks
+ * @return point
+ */
+ WorldVector getBlockTrace(int range);
+
+ /**
+ * Get the point of the block being looked at. May return null.
+ *
+ * @param range How far to checks for blocks
+ * @return point
+ */
+ WorldVector getSolidBlockTrace(int range);
+
+ /**
+ * Get the player's cardinal direction (N, W, NW, etc.). May return null.
+ *
+ * @return the direction
+ */
+ PlayerDirection getCardinalDirection();
+
+ /**
+ * Get the actor's position.
+ *
+ * If the actor has no permission, then return a dummy location.
+ *
+ * @return the actor's position
+ */
+ WorldVector getPosition();
+
+ /**
+ * Get the player's view pitch.
+ *
+ * @return pitch
+ */
+ double getPitch();
+
+ /**
+ * Get the player's view yaw.
+ *
+ * @return yaw
+ */
+ double getYaw();
+
+ /**
+ * Pass through the wall that you are looking at.
+ *
+ * @param range How far to checks for blocks
+ * @return whether the player was pass through
+ */
+ boolean passThroughForwardWall(int range);
+
+ /**
+ * Move the player.
+ *
+ * @param pos Where to move them
+ * @param pitch The pitch (up/down) of the player's view
+ * @param yaw The yaw (left/right) of the player's view
+ */
+ void setPosition(Vector pos, float pitch, float yaw);
+
+ /**
+ * Move the player.
+ *
+ * @param pos Where to move them
+ */
+ void setPosition(Vector pos);
+
}
diff --git a/src/main/java/com/sk89q/worldedit/entity/metadata/Creature.java b/src/main/java/com/sk89q/worldedit/entity/metadata/Creature.java
new file mode 100644
index 000000000..66ca80b17
--- /dev/null
+++ b/src/main/java/com/sk89q/worldedit/entity/metadata/Creature.java
@@ -0,0 +1,56 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.entity.metadata;
+
+/**
+ * Describes a creature.
+ */
+public interface Creature {
+
+ /**
+ * Returns whether the creature is a non-player character, such as
+ * a NPC human or a villager.
+ *
+ * @return true if the creature is an NPC
+ */
+ boolean isNpc();
+
+ /**
+ * Returns whether the creature can be tamed.
+ *
+ * @return true if the creature can be tamed
+ */
+ boolean isTameable();
+
+ /**
+ * Returns whether the creature is hostile.
+ *
+ * @return true if the creature is hostile
+ */
+ boolean isHostile();
+
+ /**
+ * Returns whether the creature is passive.
+ *
+ * @return true if the creature is passive
+ */
+ boolean isPassive();
+
+}
diff --git a/src/main/java/com/sk89q/worldedit/entity/metadata/EntityType.java b/src/main/java/com/sk89q/worldedit/entity/metadata/EntityType.java
new file mode 100644
index 000000000..a12225414
--- /dev/null
+++ b/src/main/java/com/sk89q/worldedit/entity/metadata/EntityType.java
@@ -0,0 +1,151 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.entity.metadata;
+
+/**
+ * Describes various classes of entities.
+ */
+public interface EntityType {
+
+ /**
+ * Test whether the entity is a player-derived entity.
+ *
+ * @return true if a player derived entity
+ */
+ boolean isPlayerDerived();
+
+ /**
+ * Test whether the entity is a projectile.
+ *
+ * @return true if a projectile
+ */
+ boolean isProjectile();
+
+ /**
+ * Test whether the entity is an item.
+ *
+ * @return true if an item
+ */
+ boolean isItem();
+
+ /**
+ * Test whether the entity is a falling block.
+ *
+ * @return true if a falling block
+ */
+ boolean isFallingBlock();
+
+ /**
+ * Test whether the entity is a painting.
+ *
+ * @return true if a painting
+ */
+ boolean isPainting();
+
+ /**
+ * Test whether the entity is an item frame.
+ *
+ * @return true if an item frame
+ */
+ boolean isItemFrame();
+
+ /**
+ * Test whether the entity is a boat.
+ *
+ * @return true if a boat
+ */
+ boolean isBoat();
+
+ /**
+ * Test whether the entity is a minecart.
+ *
+ * @return true if a minecart
+ */
+ boolean isMinecart();
+
+ /**
+ * Test whether the entity is a primed TNT block.
+ *
+ * @return true if TNT
+ */
+ boolean isTNT();
+
+ /**
+ * Test whether the entity is an experience orb.
+ *
+ * @return true if an experience orb
+ */
+ boolean isExperienceOrb();
+
+ /**
+ * Test whether the entity is a living entity.
+ *
+ * A "living entity" is the superclass of many living entity classes
+ * in Minecraft.
+ *
+ * @return true if a living entity
+ */
+ boolean isLiving();
+
+ /**
+ * Test whether the entity is an animal.
+ *
+ * @return true if an animal
+ */
+ boolean isAnimal();
+
+ /**
+ * Test whether the entity is an ambient creature, which includes
+ * the bat.
+ *
+ * @return true if an ambient creature
+ */
+ boolean isAmbient();
+
+ /**
+ * Test whether the entity is a non-player controlled character, which
+ * includes villagers, NPCs from mods, and so on.
+ *
+ * @return true if an NPC
+ */
+ boolean isNPC();
+
+ /**
+ * Test whether the entity is the iron golem from Minecraft.
+ *
+ * @return true if an iron golem
+ */
+ boolean isGolem();
+
+ /**
+ * Test whether the entity is tameable and is tamed.
+ *
+ * @return true if tamed
+ */
+ boolean isTamed();
+
+ /**
+ * Test whether the entity has been named (tagged).
+ *
+ * @return true if named
+ */
+ boolean isTagged();
+
+}
diff --git a/src/main/java/com/sk89q/worldedit/EntityType.java b/src/main/java/com/sk89q/worldedit/entity/metadata/Tameable.java
similarity index 74%
rename from src/main/java/com/sk89q/worldedit/EntityType.java
rename to src/main/java/com/sk89q/worldedit/entity/metadata/Tameable.java
index 4b4f83438..6f288a00f 100644
--- a/src/main/java/com/sk89q/worldedit/EntityType.java
+++ b/src/main/java/com/sk89q/worldedit/entity/metadata/Tameable.java
@@ -1,37 +1,34 @@
-/*
- * WorldEdit, a Minecraft world manipulation toolkit
- * Copyright (C) sk89q
- * Copyright (C) WorldEdit team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
- */
-
-package com.sk89q.worldedit;
-
-/**
- * List of removable entity types.
- */
-public enum EntityType {
- ALL,
- @Deprecated ARROWS,
- PROJECTILES,
- ITEMS,
- FALLING_BLOCKS,
- PAINTINGS,
- ITEM_FRAMES,
- BOATS,
- MINECARTS,
- TNT,
- XP_ORBS
-}
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see .
+ */
+
+package com.sk89q.worldedit.entity.metadata;
+
+/**
+ * Indicates a creature that can be tamed.
+ */
+public interface Tameable {
+
+ /**
+ * Returns whether the creature is tamed.
+ *
+ * @return true if the creature is tamed
+ */
+ boolean isTamed();
+
+}
diff --git a/src/main/java/com/sk89q/worldedit/extension/registry/BlockRegistry.java b/src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java
similarity index 88%
rename from src/main/java/com/sk89q/worldedit/extension/registry/BlockRegistry.java
rename to src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java
index 2bd118015..2cb5c9d1d 100644
--- a/src/main/java/com/sk89q/worldedit/extension/registry/BlockRegistry.java
+++ b/src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java
@@ -17,13 +17,13 @@
* along with this program. If not, see .
*/
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extension.input.InputParseException;
-import com.sk89q.worldedit.internal.registry.AbstractRegistry;
+import com.sk89q.worldedit.internal.registry.AbstractFactory;
import java.util.HashSet;
import java.util.Set;
@@ -33,16 +33,16 @@ import java.util.Set;
* new blocks from input.
*
* Instances of this class can be taken from
- * {@link WorldEdit#getBlockRegistry()}.
+ * {@link WorldEdit#getBlockFactory()}.
*/
-public class BlockRegistry extends AbstractRegistry {
+public class BlockFactory extends AbstractFactory {
/**
* Create a new instance.
*
* @param worldEdit the WorldEdit instance.
*/
- public BlockRegistry(WorldEdit worldEdit) {
+ public BlockFactory(WorldEdit worldEdit) {
super(worldEdit);
parsers.add(new DefaultBlockParser(worldEdit));
diff --git a/src/main/java/com/sk89q/worldedit/extension/registry/DefaultBlockParser.java b/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
similarity index 99%
rename from src/main/java/com/sk89q/worldedit/extension/registry/DefaultBlockParser.java
rename to src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
index fe7a63b09..3ecbc15fb 100644
--- a/src/main/java/com/sk89q/worldedit/extension/registry/DefaultBlockParser.java
+++ b/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.blocks.*;
diff --git a/src/main/java/com/sk89q/worldedit/extension/registry/DefaultMaskParser.java b/src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java
similarity index 77%
rename from src/main/java/com/sk89q/worldedit/extension/registry/DefaultMaskParser.java
rename to src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java
index 304a49b60..2d697fbbb 100644
--- a/src/main/java/com/sk89q/worldedit/extension/registry/DefaultMaskParser.java
+++ b/src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java
@@ -17,19 +17,32 @@
* along with this program. If not, see .
*/
-package com.sk89q.worldedit.extension.registry;
+package com.sk89q.worldedit.extension.factory;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.NoMatchException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.function.mask.*;
+import com.sk89q.worldedit.function.mask.BiomeMask2D;
+import com.sk89q.worldedit.function.mask.BlockMask;
+import com.sk89q.worldedit.function.mask.ExistingBlockMask;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.MaskIntersection;
+import com.sk89q.worldedit.function.mask.Masks;
+import com.sk89q.worldedit.function.mask.NoiseFilter;
+import com.sk89q.worldedit.function.mask.OffsetMask;
+import com.sk89q.worldedit.function.mask.RegionMask;
+import com.sk89q.worldedit.function.mask.SolidBlockMask;
import com.sk89q.worldedit.internal.registry.InputParser;
-import com.sk89q.worldedit.masks.BiomeTypeMask;
import com.sk89q.worldedit.math.noise.RandomNoise;
import com.sk89q.worldedit.session.request.Request;
import com.sk89q.worldedit.session.request.RequestSelection;
+import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.biome.Biomes;
+import com.sk89q.worldedit.world.registry.BiomeRegistry;
import java.util.ArrayList;
import java.util.HashSet;
@@ -109,18 +122,19 @@ class DefaultMaskParser extends InputParser {
return new MaskIntersection(offsetMask, Masks.negate(submask));
case '$':
- Set biomes = new HashSet();
+ Set biomes = new HashSet