- * 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;
-
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.extent.Extent;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * A implementation of a lazy block for {@link Extent#getLazyBlock(Vector)}
- * that takes the block's ID and metadata, but will defer loading of NBT
- * data until time of access.
- *
- * NBT data is later loaded using a call to {@link Extent#getBlock(Vector)}
- * with a stored {@link Extent} and location.
- *
- * All mutators on this object will throw an
- * {@link UnsupportedOperationException}.
- */
-public class LazyBlock extends BaseBlock {
-
- private final Extent extent;
- private final Vector position;
- private boolean loaded = false;
-
- /**
- * Create a new lazy block.
- *
- * @param type the block type
- * @param extent the extent to later load the full block data from
- * @param position the position to later load the full block data from
- */
- public LazyBlock(int type, Extent extent, Vector position) {
- super(type);
- checkNotNull(extent);
- checkNotNull(position);
- this.extent = extent;
- this.position = position;
- }
-
- /**
- * Create a new lazy block.
- *
- * @param type the block type
- * @param data the data value
- * @param extent the extent to later load the full block data from
- * @param position the position to later load the full block data from
- */
- public LazyBlock(int type, int data, Extent extent, Vector position) {
- super(type, data);
- checkNotNull(extent);
- checkNotNull(position);
- this.extent = extent;
- this.position = position;
- }
-
- @Override
- public void setId(int id) {
- throw new UnsupportedOperationException("This object is immutable");
- }
-
- @Override
- public void setData(int data) {
- throw new UnsupportedOperationException("This object is immutable");
- }
-
- @Override
- public CompoundTag getNbtData() {
- if (!loaded) {
- BaseBlock loadedBlock = extent.getBlock(position);
- super.setNbtData(loadedBlock.getNbtData());
- }
- return super.getNbtData();
- }
-
- @Override
- public void setNbtData(CompoundTag nbtData) {
- throw new UnsupportedOperationException("This object is immutable");
- }
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java
index a876a1c1f..0d175e974 100644
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java
+++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java
@@ -25,7 +25,8 @@ import com.sk89q.jnbt.NBTUtils;
import com.sk89q.jnbt.ShortTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.metadata.MobType;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.storage.InvalidFormatException;
import java.util.HashMap;
@@ -49,41 +50,23 @@ public class MobSpawnerBlock extends BaseBlock implements TileEntityBlock {
private short maxNearbyEntities;
private short requiredPlayerRange;
- /**
- * Construct the mob spawner block with a pig as the mob type.
- */
- public MobSpawnerBlock() {
- super(BlockID.MOB_SPAWNER);
- this.mobType = MobType.PIG.getName();
- }
-
- /**
- * Construct the mob spawner block with a given mob type.
- *
- * @param mobType mob type
- */
- public MobSpawnerBlock(String mobType) {
- super(BlockID.MOB_SPAWNER);
- this.mobType = mobType;
- }
-
/**
* Construct the mob spawner block with a specified data value.
*
- * @param data data value
+ * @param blockState The block state
*/
- public MobSpawnerBlock(int data) {
- super(BlockID.MOB_SPAWNER, data);
+ public MobSpawnerBlock(BlockState blockState) {
+ super(blockState);
}
/**
* Construct the mob spawner block.
*
- * @param data data value
+ * @param blockState The block state
* @param mobType mob type
*/
- public MobSpawnerBlock(int data, String mobType) {
- super(BlockID.MOB_SPAWNER, data);
+ public MobSpawnerBlock(BlockState blockState, String mobType) {
+ super(blockState);
this.mobType = mobType;
}
@@ -135,7 +118,7 @@ public class MobSpawnerBlock extends BaseBlock implements TileEntityBlock {
@Override
public CompoundTag getNbtData() {
- Map values = new HashMap();
+ Map values = new HashMap<>();
values.put("EntityId", new StringTag(mobType));
values.put("Delay", new ShortTag(delay));
values.put("SpawnCount", new ShortTag(spawnCount));
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/NoteBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/NoteBlock.java
deleted file mode 100644
index f061723c1..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/NoteBlock.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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;
-
-import com.sk89q.jnbt.ByteTag;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.StringTag;
-import com.sk89q.jnbt.Tag;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A note block.
- */
-public class NoteBlock extends BaseBlock implements TileEntityBlock {
-
- private byte note;
-
- /**
- * Construct the note block with a data value of 0.
- */
- public NoteBlock() {
- super(BlockID.NOTE_BLOCK);
- this.note = 0;
- }
-
- /**
- * Construct the note block with a given data value.
- *
- * @param data data value
- */
- public NoteBlock(int data) {
- super(BlockID.NOTE_BLOCK, data);
- this.note = 0;
- }
-
- /**
- * Construct the note block with a given data value and note.
- *
- * @param data data value
- * @param note note
- */
- public NoteBlock(int data, byte note) {
- super(BlockID.NOTE_BLOCK, data);
- this.note = note;
- }
-
- /**
- * Get the note.
- *
- * @return the note
- */
- public byte getNote() {
- return note;
- }
-
- /**
- * Set the note.
- *
- * @param note the note to set
- */
- public void setNote(byte note) {
- this.note = note;
- }
-
- @Override
- public boolean hasNbtData() {
- return true;
- }
-
- @Override
- public String getNbtId() {
- return "Music";
- }
-
- @Override
- public CompoundTag getNbtData() {
- Map values = new HashMap();
- values.put("note", new ByteTag(note));
- return new CompoundTag(values);
- }
-
- @Override
- public void setNbtData(CompoundTag rootTag) {
- if (rootTag == null) {
- return;
- }
-
- Map values = rootTag.getValue();
-
- Tag t;
-
- t = values.get("id");
- if (!(t instanceof StringTag) || !((StringTag) t).getValue().equals("Music")) {
- throw new RuntimeException("'Music' tile entity expected");
- }
-
- t = values.get("note");
- if (t instanceof ByteTag) {
- note = ((ByteTag) t).getValue();
- }
- }
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java
index 78f78419e..e11330faa 100644
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java
+++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java
@@ -23,6 +23,8 @@ import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.util.gson.GsonUtil;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;
import java.util.HashMap;
import java.util.Map;
@@ -36,26 +38,14 @@ public class SignBlock extends BaseBlock implements TileEntityBlock {
private static String EMPTY = "{\"text\":\"\"}";
- /**
- * Construct the sign without text.
- *
- * @param type type ID
- * @param data data value (orientation)
- */
- public SignBlock(int type, int data) {
- super(type, data);
- this.text = new String[] { EMPTY, EMPTY, EMPTY, EMPTY };
- }
-
/**
* Construct the sign with text.
*
- * @param type type ID
- * @param data data value (orientation)
+ * @param blockState The block state
* @param text lines of text
*/
- public SignBlock(int type, int data, String[] text) {
- super(type, data);
+ public SignBlock(BlockState blockState, String[] text) {
+ super(blockState);
if (text == null) {
this.text = new String[] { EMPTY, EMPTY, EMPTY, EMPTY };
return;
@@ -103,7 +93,7 @@ public class SignBlock extends BaseBlock implements TileEntityBlock {
@Override
public CompoundTag getNbtData() {
- Map values = new HashMap();
+ Map values = new HashMap<>();
values.put("Text1", new StringTag(text[0]));
values.put("Text2", new StringTag(text[1]));
values.put("Text3", new StringTag(text[2]));
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java
index d440ee0f7..4ecddddc2 100644
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java
+++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java
@@ -19,10 +19,11 @@
package com.sk89q.worldedit.blocks;
-import com.sk89q.jnbt.ByteTag;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;
import java.util.HashMap;
import java.util.Map;
@@ -33,60 +34,25 @@ import java.util.Map;
public class SkullBlock extends BaseBlock implements TileEntityBlock {
private String owner = ""; // notchian
- private byte skullType; // stored here for block, in damage value for item
- private byte rot; // only matters if block data == 0x1 (on floor)
/**
* Construct the skull block with a default type of skelton.
- * @param data data value to set, controls placement
+ * @param state BlockState to set
*/
- public SkullBlock(int data) {
- this(data, (byte) 0);
- }
-
- /**
- * Construct the skull block with a given type.
- * 0 - skeleton
- * 1 - wither skelly
- * 2 - zombie
- * 3 - human
- * 4 - creeper
- * @param data data value to set, controls placement
- * @param type type of skull
- */
- public SkullBlock(int data, byte type) {
- this(data, type, (byte) 0);
- }
-
- /**
- * Construct the skull block with a given type and rotation.
- * @param data data value to set, controls placement
- * @param type type of skull
- * @param rot rotation (if on floor)
- */
- public SkullBlock(int data, byte type, byte rot) {
- super(BlockID.HEAD, data);
- if (type < (byte) 0 || type > (byte) 4) {
- this.skullType = (byte) 0;
- } else {
- this.skullType = type;
- }
- this.rot = rot;
+ public SkullBlock(BlockState state) {
+ super(state);
this.owner = "";
}
/**
* Construct the skull block with a given rotation and owner.
* The type is assumed to be player unless owner is null or empty.
- * @param data data value to set, controls placement
- * @param rot rotation of skull
+ * @param blockState BlockState to set
* @param owner name of player
*/
- public SkullBlock(int data, byte rot, String owner) {
- super(BlockID.HEAD, data);
- this.rot = rot;
+ public SkullBlock(BlockState blockState, String owner) {
+ super(blockState);
this.setOwner(owner);
- if (owner == null || owner.isEmpty()) this.skullType = (byte) 0;
}
/**
@@ -100,7 +66,6 @@ public class SkullBlock extends BaseBlock implements TileEntityBlock {
if (owner.length() > 16 || owner.isEmpty()) this.owner = "";
else this.owner = owner;
}
- if (this.owner != null && !this.owner.isEmpty()) this.skullType = (byte) 3;
}
/**
@@ -111,38 +76,6 @@ public class SkullBlock extends BaseBlock implements TileEntityBlock {
return owner;
}
- /**
- * Get the type of skull.
- * @return the skullType
- */
- public byte getSkullType() {
- return skullType;
- }
-
- /**
- * Set the type of skull;
- * @param skullType the skullType to set
- */
- public void setSkullType(byte skullType) {
- this.skullType = skullType;
- }
-
- /**
- * Get rotation of skull. This only means anything if the block data is 1.
- * @return the rotation
- */
- public byte getRot() {
- return rot;
- }
-
- /**
- * Set the rotation of skull.
- * @param rot the rotation to set
- */
- public void setRot(byte rot) {
- this.rot = rot;
- }
-
@Override
public boolean hasNbtData() {
return true;
@@ -155,11 +88,9 @@ public class SkullBlock extends BaseBlock implements TileEntityBlock {
@Override
public CompoundTag getNbtData() {
- Map values = new HashMap();
- values.put("SkullType", new ByteTag(skullType));
+ Map values = new HashMap<>();
if (owner == null) owner = "";
- values.put("ExtraType", new StringTag( owner));
- values.put("Rot", new ByteTag(rot));
+ values.put("ExtraType", new StringTag(owner));
return new CompoundTag(values);
}
@@ -178,17 +109,9 @@ public class SkullBlock extends BaseBlock implements TileEntityBlock {
throw new RuntimeException("'Skull' tile entity expected");
}
- t = values.get("SkullType");
- if (t instanceof ByteTag) {
- skullType = ((ByteTag) t).getValue();
- }
t = values.get("ExtraType");
- if (t != null && t instanceof StringTag) {
+ if (t instanceof StringTag) {
owner = ((StringTag) t).getValue();
}
- t = values.get("Rot");
- if (t instanceof ByteTag) {
- rot = ((ByteTag) t).getValue();
- }
}
}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/foundation/Block.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/foundation/Block.java
deleted file mode 100644
index c39c51e57..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/foundation/Block.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.foundation;
-
-import com.sk89q.worldedit.blocks.BaseBlock;
-
-/**
- * @deprecated Use {@link BaseBlock}
- */
-@Deprecated
-public abstract class Block {
-
- public abstract int getId();
-
- public abstract void setId(int id);
-
- public abstract int getData();
-
- public abstract void setData(int data);
-
- public abstract void setIdAndData(int id, int data);
-
- public abstract boolean hasWildcardData();
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/AbstractMask.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/AbstractMask.java
deleted file mode 100644
index 704ce4035..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/AbstractMask.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.masks;
-
-import com.sk89q.worldedit.LocalPlayer;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.Vector;
-
-/**
- * @deprecated Switch to {@link com.sk89q.worldedit.function.mask.AbstractMask}
- */
-@Deprecated
-public abstract class AbstractMask implements Mask {
- @Override
- public void prepare(LocalSession session, LocalPlayer player, Vector target) {
- }
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/BlockMask.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/BlockMask.java
deleted file mode 100644
index a6dd9ab97..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/BlockMask.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.masks;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BaseBlock;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @deprecated Use {@link com.sk89q.worldedit.function.mask.BlockMask}
- */
-@Deprecated
-public class BlockMask extends AbstractMask {
-
- private final Set blocks;
-
- public BlockMask() {
- blocks = new HashSet();
- }
-
- public BlockMask(Set types) {
- this.blocks = types;
- }
-
- public BlockMask(BaseBlock... block) {
- blocks = new HashSet();
- for (BaseBlock b : block) {
- add(b);
- }
- }
-
- public BlockMask(BaseBlock block) {
- this();
- add(block);
- }
-
- public void add(BaseBlock block) {
- blocks.add(block);
- }
-
- public void addAll(Collection blocks) {
- blocks.addAll(blocks);
- }
-
- @Override
- public boolean matches(EditSession editSession, Vector position) {
- BaseBlock block = editSession.getBlock(position);
- return blocks.contains(block)
- || blocks.contains(new BaseBlock(block.getType(), -1));
- }
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/CombinedMask.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/CombinedMask.java
deleted file mode 100644
index 3f7a6690e..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/CombinedMask.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.masks;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.LocalPlayer;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.function.mask.MaskIntersection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @deprecated See {@link MaskIntersection}
- */
-@Deprecated
-public class CombinedMask extends AbstractMask {
- private final List masks = new ArrayList();
-
- public CombinedMask() {
- }
-
- public CombinedMask(Mask mask) {
- add(mask);
- }
-
- public CombinedMask(Mask ...mask) {
- for (Mask m : mask) {
- add(m);
- }
- }
-
- public CombinedMask(List masks) {
- this.masks.addAll(masks);
- }
-
- public void add(Mask mask) {
- masks.add(mask);
- }
-
- public boolean remove(Mask mask) {
- return masks.remove(mask);
- }
-
- public boolean has(Mask mask) {
- return masks.contains(mask);
- }
-
- @Override
- public void prepare(LocalSession session, LocalPlayer player, Vector target) {
- for (Mask mask : masks) {
- mask.prepare(session, player, target);
- }
- }
-
- @Override
- public boolean matches(EditSession editSession, Vector position) {
- for (Mask mask : masks) {
- if (!mask.matches(editSession, position)) {
- return false;
- }
- }
-
- return true;
- }
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/ExistingBlockMask.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/ExistingBlockMask.java
deleted file mode 100644
index 487786d06..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/ExistingBlockMask.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.masks;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockID;
-
-/**
- * @deprecated See {@link com.sk89q.worldedit.function.mask.ExistingBlockMask}
- */
-@Deprecated
-public class ExistingBlockMask extends AbstractMask {
- @Override
- public boolean matches(EditSession editSession, Vector position) {
- return editSession.getBlockType(position) != BlockID.AIR;
- }
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/FuzzyBlockMask.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/FuzzyBlockMask.java
deleted file mode 100644
index 63093624c..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/FuzzyBlockMask.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.masks;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.Blocks;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @deprecated See {@link com.sk89q.worldedit.function.mask.FuzzyBlockMask}
- */
-@Deprecated
-public class FuzzyBlockMask extends AbstractMask {
-
- private final Set filter;
-
- /**
- * Create a new fuzzy block mask.
- *
- * @param filter a list of block types to match
- */
- public FuzzyBlockMask(Set filter) {
- this.filter = filter;
- }
-
- /**
- * Create a new fuzzy block mask.
- *
- * @param block a list of block types to match
- */
- public FuzzyBlockMask(BaseBlock... block) {
- Set filter = new HashSet();
- Collections.addAll(filter, block);
- this.filter = filter;
- }
-
- @Override
- public boolean matches(EditSession editSession, Vector position) {
- BaseBlock compare = new BaseBlock(editSession.getBlockType(position), editSession.getBlockData(position));
- return Blocks.containsFuzzy(filter, compare);
- }
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/Mask.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/Mask.java
deleted file mode 100644
index cf0a04c89..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/Mask.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.masks;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.LocalPlayer;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.Vector;
-
-/**
- * @deprecated Use {@link com.sk89q.worldedit.function.mask.Mask}
- */
-@Deprecated
-public interface Mask {
-
- /**
- * Called one time before each edit session.
- *
- * @param session a session
- * @param player a player
- * @param target target of the brush, null if not a brush mask
- */
- void prepare(LocalSession session, LocalPlayer player, Vector target);
-
- /**
- * Given a block position, this method returns true if the block at
- * that position matches the filter. Block information is not provided
- * as getting a BaseBlock has unneeded overhead in most block querying
- * situations (enumerating a chest's contents is a waste, for example).
- *
- * @param editSession an instance
- * @param position the position to check
- * @return true if it matches
- */
- boolean matches(EditSession editSession, Vector position);
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/SolidBlockMask.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/SolidBlockMask.java
deleted file mode 100644
index dd5403441..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/SolidBlockMask.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.masks;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockType;
-
-/**
- * @deprecated See {@link com.sk89q.worldedit.function.mask.SolidBlockMask}
- */
-@Deprecated
-public class SolidBlockMask extends AbstractMask {
- @Override
- public boolean matches(EditSession editSession, Vector position) {
- return !BlockType.canPassThrough(editSession.getBlockType(position), editSession.getBlockData(position));
- }
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/UnderOverlayMask.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/UnderOverlayMask.java
deleted file mode 100644
index 39fe3dc8e..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/masks/UnderOverlayMask.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.masks;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.LocalPlayer;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.function.mask.MaskIntersection;
-import com.sk89q.worldedit.function.mask.Masks;
-import com.sk89q.worldedit.function.mask.OffsetMask;
-
-import java.util.Set;
-
-/**
- * @deprecated Use {@link OffsetMask} with {@link MaskIntersection} and {@link Masks#negate(com.sk89q.worldedit.function.mask.Mask)}
- */
-@Deprecated
-public class UnderOverlayMask extends AbstractMask {
- private final int yMod;
- private Mask mask;
-
- @Deprecated
- public UnderOverlayMask(Set ids, boolean overlay) {
- this(new BlockTypeMask(ids), overlay);
- }
-
- public UnderOverlayMask(Mask mask, boolean overlay) {
- this.yMod = overlay ? -1 : 1;
- this.mask = mask;
- }
-
- @Deprecated
- public void addAll(Set ids) {
- if (mask instanceof BlockMask) {
- final BlockMask blockTypeMask = (BlockMask) mask;
- for (Integer id : ids) {
- blockTypeMask.add(new BaseBlock(id));
- }
- } else if (mask instanceof ExistingBlockMask) {
- final BlockMask blockMask = new BlockMask();
- for (int type : ids) {
- blockMask.add(new BaseBlock(type));
- }
- mask = blockMask;
- }
- }
-
- @Override
- public void prepare(LocalSession session, LocalPlayer player, Vector target) {
- mask.prepare(session, player, target);
- }
-
- @Override
- public boolean matches(EditSession editSession, Vector position) {
- return !mask.matches(editSession, position) && mask.matches(editSession, position.add(0, yMod, 0));
- }
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/Pattern.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/Pattern.java
deleted file mode 100644
index b27e8e0fc..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/Pattern.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.patterns;
-
-import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.blocks.BaseBlock;
-
-/**
- * @deprecated See {@link com.sk89q.worldedit.function.pattern.Pattern}
- */
-@Deprecated
-public interface Pattern {
-
- /**
- * Get a block for a position. This return value of this method does
- * not have to be consistent for the same position.
- *
- * @param position the position where a block is needed
- * @return a block
- */
- public BaseBlock next(Vector position);
-
- /**
- * Get a block for a position. This return value of this method does
- * not have to be consistent for the same position.
- *
- * @param x the X coordinate
- * @param y the Y coordinate
- * @param z the Z coordinate
- * @return a block
- */
- public BaseBlock next(int x, int y, int z);
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/RandomFillPattern.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/RandomFillPattern.java
deleted file mode 100644
index 6014eec36..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/RandomFillPattern.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.patterns;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.function.pattern.RandomPattern;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-/**
- * @deprecated See {@link RandomPattern}
- */
-@Deprecated
-public class RandomFillPattern implements Pattern {
-
- private static final Random random = new Random();
- private List blocks;
-
- /**
- * Construct the object.
- *
- * @param blocks a list of blocks
- */
- public RandomFillPattern(List blocks) {
- double max = 0;
-
- for (BlockChance block : blocks) {
- max += block.getChance();
- }
-
- List finalBlocks = new ArrayList();
-
- double i = 0;
-
- for (BlockChance block : blocks) {
- double v = block.getChance() / max;
- i += v;
- finalBlocks.add(new BlockChance(block.getBlock(), i));
- }
-
- this.blocks = finalBlocks;
- }
-
- @Override
- public BaseBlock next(Vector position) {
- double r = random.nextDouble();
-
- for (BlockChance block : blocks) {
- if (r <= block.getChance()) {
- return block.getBlock();
- }
- }
-
- throw new RuntimeException("ProportionalFillPattern");
- }
-
- @Override
- public BaseBlock next(int x, int y, int z) {
- return next(null);
- }
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/AbstractLegacyRegionSelector.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/AbstractLegacyRegionSelector.java
deleted file mode 100644
index 1930e3b9f..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/AbstractLegacyRegionSelector.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.regions;
-
-import com.sk89q.worldedit.LocalPlayer;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.extension.platform.Actor;
-
-abstract class AbstractLegacyRegionSelector implements RegionSelector {
-
- @Deprecated
- public final void explainPrimarySelection(LocalPlayer player, LocalSession session, Vector position) {
- explainPrimarySelection((Actor) player, session, position);
- }
-
- @Deprecated
- public final void explainSecondarySelection(LocalPlayer player, LocalSession session, Vector position) {
- explainSecondarySelection((Actor) player, session, position);
- }
-
- @Deprecated
- public final void explainRegionAdjust(LocalPlayer player, LocalSession session) {
- explainRegionAdjust((Actor) player, session);
- }
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegionSelector.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegionSelector.java
deleted file mode 100644
index f264546dd..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/ConvexPolyhedralRegionSelector.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.regions;
-
-import com.sk89q.worldedit.internal.cui.CUIRegion;
-
-/**
- * @deprecated This class only exists as to not break binary compatibility
- */
-@Deprecated
-public abstract class ConvexPolyhedralRegionSelector extends AbstractLegacyRegionSelector implements CUIRegion {
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/CuboidRegionSelector.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/CuboidRegionSelector.java
deleted file mode 100644
index 458d75cb3..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/CuboidRegionSelector.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.regions;
-
-import com.sk89q.worldedit.internal.cui.CUIRegion;
-
-/**
- * @deprecated This class only exists as to not break binary compatibility
- */
-@Deprecated
-public abstract class CuboidRegionSelector extends AbstractLegacyRegionSelector implements CUIRegion {
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/CylinderRegionSelector.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/CylinderRegionSelector.java
deleted file mode 100644
index b54709e7d..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/CylinderRegionSelector.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.regions;
-
-import com.sk89q.worldedit.internal.cui.CUIRegion;
-
-/**
- * @deprecated This class only exists as to not break binary compatibility
- */
-@Deprecated
-public abstract class CylinderRegionSelector extends AbstractLegacyRegionSelector implements CUIRegion {
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/EllipsoidRegionSelector.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/EllipsoidRegionSelector.java
deleted file mode 100644
index 69bf5ba2b..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/EllipsoidRegionSelector.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.regions;
-
-import com.sk89q.worldedit.internal.cui.CUIRegion;
-
-/**
- * @deprecated This class only exists as to not break binary compatibility
- */
-@Deprecated
-public abstract class EllipsoidRegionSelector extends AbstractLegacyRegionSelector implements CUIRegion {
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/ExtendingCuboidRegionSelector.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/ExtendingCuboidRegionSelector.java
deleted file mode 100644
index d9888a447..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/ExtendingCuboidRegionSelector.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.regions;
-
-import com.sk89q.worldedit.internal.cui.CUIRegion;
-
-/**
- * @deprecated This class only exists as to not break binary compatibility
- */
-@Deprecated
-public abstract class ExtendingCuboidRegionSelector extends AbstractLegacyRegionSelector implements CUIRegion {
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/Polygonal2DRegionSelector.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/Polygonal2DRegionSelector.java
deleted file mode 100644
index f3b8a9cbd..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/Polygonal2DRegionSelector.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.regions;
-
-import com.sk89q.worldedit.internal.cui.CUIRegion;
-
-/**
- * @deprecated This class only exists as to not break binary compatibility
- */
-@Deprecated
-public abstract class Polygonal2DRegionSelector extends AbstractLegacyRegionSelector implements CUIRegion {
-
- /**
- * Get the number of points.
- *
- * @return the number of points
- */
- public abstract int getPointCount();
-
-}
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/SphereRegionSelector.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/SphereRegionSelector.java
deleted file mode 100644
index 8a3057dc0..000000000
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/regions/SphereRegionSelector.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.regions;
-
-import com.sk89q.worldedit.internal.cui.CUIRegion;
-
-/**
- * @deprecated This class only exists as to not break binary compatibility
- */
-@Deprecated
-public abstract class SphereRegionSelector extends AbstractLegacyRegionSelector implements CUIRegion {
-}
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTag.java
index 6477d2502..2c439e11b 100644
--- a/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTag.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTag.java
@@ -72,7 +72,7 @@ public final class CompoundTag extends Tag {
* @return the builder
*/
public CompoundTagBuilder createBuilder() {
- return new CompoundTagBuilder(new HashMap(value));
+ return new CompoundTagBuilder(new HashMap<>(value));
}
/**
@@ -317,6 +317,24 @@ public final class CompoundTag extends Tag {
}
}
+ /**
+ * Get a {@code long[]} named with the given key.
+ *
+ * If the key does not exist or its value is not an long array tag,
+ * then an empty array will be returned.
+ *
+ * @param key the key
+ * @return an int array
+ */
+ public long[] getLongArray(String key) {
+ Tag tag = value.get(key);
+ if (tag instanceof LongArrayTag) {
+ return ((LongArrayTag) tag).getValue();
+ } else {
+ return new long[0];
+ }
+ }
+
/**
* Get a long named with the given key.
*
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java b/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java
index 3d476fa40..b0e873c0d 100644
--- a/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java
@@ -19,11 +19,11 @@
package com.sk89q.jnbt;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.util.HashMap;
import java.util.Map;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* Helps create compound tags.
*/
@@ -35,7 +35,7 @@ public class CompoundTagBuilder {
* Create a new instance.
*/
CompoundTagBuilder() {
- this.entries = new HashMap();
+ this.entries = new HashMap<>();
}
/**
@@ -133,6 +133,18 @@ public class CompoundTagBuilder {
return put(key, new IntTag(value));
}
+ /**
+ * Put the given key and value into the compound tag as a
+ * {@code LongArrayTag}.
+ *
+ * @param key they key
+ * @param value the value
+ * @return this object
+ */
+ public CompoundTagBuilder putLongArray(String key, long[] value) {
+ return put(key, new LongArrayTag(value));
+ }
+
/**
* Put the given key and value into the compound tag as a
* {@code LongTag}.
@@ -189,7 +201,7 @@ public class CompoundTagBuilder {
* @return the new compound tag
*/
public CompoundTag build() {
- return new CompoundTag(new HashMap(entries));
+ return new CompoundTag(new HashMap<>(entries));
}
/**
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/ListTag.java b/worldedit-core/src/main/java/com/sk89q/jnbt/ListTag.java
index 3cbe42977..7a2482344 100644
--- a/worldedit-core/src/main/java/com/sk89q/jnbt/ListTag.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/ListTag.java
@@ -19,12 +19,12 @@
package com.sk89q.jnbt;
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.util.Collections;
import java.util.List;
-import java.util.NoSuchElementException;
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
/**
* The {@code TAG_List} tag.
@@ -79,11 +79,10 @@ public final class ListTag extends Tag {
*/
@Nullable
public Tag getIfExists(int index) {
- try {
- return value.get(index);
- } catch (NoSuchElementException e) {
+ if (index >= value.size()) {
return null;
}
+ return value.get(index);
}
/**
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/ListTagBuilder.java b/worldedit-core/src/main/java/com/sk89q/jnbt/ListTagBuilder.java
index 9bcbbfd05..c410ec3ae 100644
--- a/worldedit-core/src/main/java/com/sk89q/jnbt/ListTagBuilder.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/ListTagBuilder.java
@@ -19,13 +19,13 @@
package com.sk89q.jnbt;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* Helps create list tags.
*/
@@ -42,7 +42,7 @@ public class ListTagBuilder {
ListTagBuilder(Class type) {
checkNotNull(type);
this.type = type;
- this.entries = new ArrayList();
+ this.entries = new ArrayList<>();
}
/**
@@ -80,7 +80,7 @@ public class ListTagBuilder {
* @return the new list tag
*/
public ListTag build() {
- return new ListTag(type, new ArrayList(entries));
+ return new ListTag(type, new ArrayList<>(entries));
}
/**
diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/ClipboardPattern.java b/worldedit-core/src/main/java/com/sk89q/jnbt/LongArrayTag.java
similarity index 51%
rename from worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/ClipboardPattern.java
rename to worldedit-core/src/main/java/com/sk89q/jnbt/LongArrayTag.java
index 8808a0684..30dad0cc3 100644
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/patterns/ClipboardPattern.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/LongArrayTag.java
@@ -17,41 +17,44 @@
* along with this program. If not, see .
*/
-package com.sk89q.worldedit.patterns;
+package com.sk89q.jnbt;
-import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
- * Pattern that repeats the clipboard.
+ * The {@code TAG_Long_Array} tag.
*/
-public class ClipboardPattern implements Pattern {
+public class LongArrayTag extends Tag {
- private CuboidClipboard clipboard;
- private Vector size;
+ private final long[] value;
/**
- * Construct the object.
+ * Creates the tag with an empty name.
*
- * @param clipboard the clipboard
+ * @param value the value of the tag
*/
- public ClipboardPattern(CuboidClipboard clipboard) {
- this.clipboard = clipboard;
- this.size = clipboard.getSize();
+ public LongArrayTag(long[] value) {
+ super();
+ checkNotNull(value);
+ this.value = value;
}
@Override
- public BaseBlock next(Vector position) {
- return next(position.getBlockX(), position.getBlockY(), position.getBlockZ());
+ public long[] getValue() {
+ return value;
}
@Override
- public BaseBlock next(int x, int y, int z) {
- int xp = Math.abs(x) % size.getBlockX();
- int yp = Math.abs(y) % size.getBlockY();
- int zp = Math.abs(z) % size.getBlockZ();
-
- return clipboard.getPoint(new Vector(xp, yp, zp));
+ public String toString() {
+ StringBuilder hex = new StringBuilder();
+ for (long b : value) {
+ String hexDigits = Long.toHexString(b).toUpperCase();
+ if (hexDigits.length() == 1) {
+ hex.append("0");
+ }
+ hex.append(hexDigits).append(" ");
+ }
+ return "TAG_Long_Array(" + hex + ")";
}
}
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTConstants.java b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTConstants.java
index 2ff2768ac..1cbff362d 100644
--- a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTConstants.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTConstants.java
@@ -31,7 +31,7 @@ public final class NBTConstants {
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,
- TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11;
+ TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11, TYPE_LONG_ARRAY = 12;
/**
* Default private constructor.
@@ -73,6 +73,8 @@ public final class NBTConstants {
return CompoundTag.class;
case TYPE_INT_ARRAY:
return IntArrayTag.class;
+ case TYPE_LONG_ARRAY:
+ return LongArrayTag.class;
default:
throw new IllegalArgumentException("Unknown tag type ID of " + id);
}
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTInputStream.java b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTInputStream.java
index 223ca2248..b6096a163 100644
--- a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTInputStream.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTInputStream.java
@@ -128,7 +128,7 @@ public final class NBTInputStream implements Closeable {
int childType = is.readByte();
length = is.readInt();
- List tagList = new ArrayList();
+ List tagList = new ArrayList<>();
for (int i = 0; i < length; ++i) {
Tag tag = readTagPayload(childType, depth + 1);
if (tag instanceof EndTag) {
@@ -139,7 +139,7 @@ public final class NBTInputStream implements Closeable {
return new ListTag(NBTUtils.getTypeClass(childType), tagList);
case NBTConstants.TYPE_COMPOUND:
- Map tagMap = new HashMap();
+ Map tagMap = new HashMap<>();
while (true) {
NamedTag namedTag = readNamedTag(depth + 1);
Tag tag = namedTag.getTag();
@@ -158,6 +158,13 @@ public final class NBTInputStream implements Closeable {
data[i] = is.readInt();
}
return new IntArrayTag(data);
+ case NBTConstants.TYPE_LONG_ARRAY:
+ length = is.readInt();
+ long[] longData = new long[length];
+ for (int i = 0; i < length; i++) {
+ longData[i] = is.readLong();
+ }
+ return new LongArrayTag(longData);
default:
throw new IOException("Invalid tag type: " + type + ".");
}
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTOutputStream.java b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTOutputStream.java
index a54ea6e26..5bed0297f 100644
--- a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTOutputStream.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTOutputStream.java
@@ -19,6 +19,8 @@
package com.sk89q.jnbt;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.io.Closeable;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -26,8 +28,6 @@ import java.io.OutputStream;
import java.util.List;
import java.util.Map;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* This class writes NBT, or Named Binary Tag
* {@code Tag} objects to an underlying {@code OutputStream}.
@@ -129,6 +129,9 @@ public final class NBTOutputStream implements Closeable {
case NBTConstants.TYPE_INT_ARRAY:
writeIntArrayTagPayload((IntArrayTag) tag);
break;
+ case NBTConstants.TYPE_LONG_ARRAY:
+ writeLongArrayTagPayload((LongArrayTag) tag);
+ break;
default:
throw new IOException("Invalid tag type: " + type + ".");
}
@@ -286,6 +289,14 @@ public final class NBTOutputStream implements Closeable {
}
}
+ private void writeLongArrayTagPayload(LongArrayTag tag) throws IOException {
+ long[] data = tag.getValue();
+ os.writeInt(data.length);
+ for (long aData : data) {
+ os.writeLong(aData);
+ }
+ }
+
@Override
public void close() throws IOException {
os.close();
diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java
index 428ff4d86..e44262911 100644
--- a/worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java
+++ b/worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java
@@ -19,13 +19,13 @@
package com.sk89q.jnbt;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import com.sk89q.worldedit.Vector;
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.
*
@@ -69,6 +69,8 @@ public final class NBTUtils {
return "TAG_String";
} else if (clazz.equals(IntArrayTag.class)) {
return "TAG_Int_Array";
+ } else if (clazz.equals(LongArrayTag.class)) {
+ return "TAG_Long_Array";
} else {
throw new IllegalArgumentException("Invalid tag classs ("
+ clazz.getName() + ").");
@@ -107,6 +109,8 @@ public final class NBTUtils {
return NBTConstants.TYPE_STRING;
} else if (clazz.equals(IntArrayTag.class)) {
return NBTConstants.TYPE_INT_ARRAY;
+ } else if (clazz.equals(LongArrayTag.class)) {
+ return NBTConstants.TYPE_LONG_ARRAY;
} else {
throw new IllegalArgumentException("Invalid tag classs ("
+ clazz.getName() + ").");
@@ -146,6 +150,8 @@ public final class NBTUtils {
return CompoundTag.class;
case NBTConstants.TYPE_INT_ARRAY:
return IntArrayTag.class;
+ case NBTConstants.TYPE_LONG_ARRAY:
+ return LongArrayTag.class;
default:
throw new IllegalArgumentException("Invalid tag type : " + type
+ ".");
diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java
index d1db70207..9dfc58d6f 100644
--- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java
+++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandContext.java
@@ -34,8 +34,8 @@ public class CommandContext {
protected final List originalArgIndices;
protected final String[] originalArgs;
- protected final Set booleanFlags = new HashSet();
- protected final Map valueFlags = new HashMap();
+ protected final Set booleanFlags = new HashSet<>();
+ protected final Map valueFlags = new HashMap<>();
protected final SuggestionContext suggestionContext;
protected final CommandLocals locals;
@@ -103,8 +103,8 @@ public class CommandContext {
SuggestionContext suggestionContext = SuggestionContext.hangingValue();
// Eliminate empty args and combine multiword args first
- List argIndexList = new ArrayList(args.length);
- List argList = new ArrayList(args.length);
+ List argIndexList = new ArrayList<>(args.length);
+ List argList = new ArrayList<>(args.length);
for (int i = 1; i < args.length; ++i) {
isHanging = false;
@@ -152,8 +152,8 @@ public class CommandContext {
// Then flags
- this.originalArgIndices = new ArrayList(argIndexList.size());
- this.parsedArgs = new ArrayList(argList.size());
+ this.originalArgIndices = new ArrayList<>(argIndexList.size());
+ this.parsedArgs = new ArrayList<>(argList.size());
if (parseFlags) {
for (int nextArg = 0; nextArg < argList.size(); ) {
diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java
index e81344e56..4345793d1 100644
--- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java
+++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java
@@ -19,16 +19,17 @@
package com.sk89q.minecraft.util.commands;
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
public class CommandException extends Exception {
- private List commandStack = new ArrayList();
+ private List commandStack = new ArrayList<>();
public CommandException() {
super();
diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandLocals.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandLocals.java
index e0053f0b3..0bc2992a5 100644
--- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandLocals.java
+++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandLocals.java
@@ -24,7 +24,7 @@ import java.util.Map;
public class CommandLocals {
- private final Map locals = new HashMap();
+ private final Map locals = new HashMap<>();
public boolean containsKey(Object key) {
return locals.containsKey(key);
diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandsManager.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandsManager.java
index eec7ced7c..a8f49678b 100644
--- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandsManager.java
+++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandsManager.java
@@ -72,18 +72,18 @@ public abstract class CommandsManager {
* the key of the command name (one for each alias) with the
* method.
*/
- protected Map> commands = new HashMap>();
+ protected Map> commands = new HashMap<>();
/**
* Used to store the instances associated with a method.
*/
- protected Map instances = new HashMap();
+ protected Map instances = new HashMap<>();
/**
* Mapping of commands (not including aliases) with a description. This
* is only for top level commands.
*/
- protected Map descs = new HashMap