YZX_ORDER =
Comparator.comparingInt(BlockVector3::getY)
.thenComparingInt(BlockVector3::getZ)
@@ -151,38 +150,6 @@ public abstract class BlockVector3 {
return BlockVector3.at(getX(), getY(), getZ());
}
-// /**
-// * Get the BlockVector3 to the north
-// * Normal use you would use north(this),
-// * To avoid constructing a new Vector, pass e.g. north(some MutableBlockVector3)
-// * There is no gaurantee it will use this provided vector
-// * @param orDefault the vector to use as the result
-// * @return BlockVector3
-// */
-// public BlockVector3 north(BlockVector3 orDefault) {
-// return orDefault.setComponents(getX(), getY(), getZ() - 1);
-// }
-//
-// public BlockVector3 east(BlockVector3 orDefault) {
-// return orDefault.setComponents(getX() + 1, getY(), getZ());
-// }
-//
-// public BlockVector3 south(BlockVector3 orDefault) {
-// return orDefault.setComponents(getX(), getY(), getZ() + 1);
-// }
-//
-// public BlockVector3 west(BlockVector3 orDefault) {
-// return orDefault.setComponents(getX() - 1, getY(), getZ());
-// }
-//
-// public BlockVector3 up(BlockVector3 orDefault) {
-// return orDefault.setComponents(getX(), getY() + 1, getZ());
-// }
-//
-// public BlockVector3 down(BlockVector3 orDefault) {
-// return orDefault.setComponents(getX(), getY() - 1, getZ());
-// }
-
public long toLongPackedForm() {
checkLongPackable(this);
return (getX() & BITS_26) | ((getZ() & BITS_26) << 26) | (((getY() & (long) BITS_12) << (26 + 26)));
@@ -289,7 +256,8 @@ public abstract class BlockVector3 {
}
/**
- * Add a list of vectors to this vector and return the result as a new vector.
+ * Add a list of vectors to this vector and return the
+ * result as a new vector.
*
* @param others an array of vectors
* @return a new vector
@@ -307,7 +275,8 @@ public abstract class BlockVector3 {
}
/**
- * Subtract another vector from this vector and return the result as a new vector.
+ * Subtract another vector from this vector and return the result
+ * as a new vector.
*
* @param other the other vector
* @return a new vector
@@ -317,7 +286,8 @@ public abstract class BlockVector3 {
}
/**
- * Subtract another vector from this vector and return the result as a new vector.
+ * Subtract another vector from this vector and return the result
+ * as a new vector.
*
* @param x the value to subtract
* @param y the value to subtract
@@ -329,7 +299,8 @@ public abstract class BlockVector3 {
}
/**
- * Subtract a list of vectors from this vector and return the result as a new vector.
+ * Subtract a list of vectors from this vector and return the result
+ * as a new vector.
*
* @param others an array of vectors
* @return a new vector
@@ -514,7 +485,8 @@ public abstract class BlockVector3 {
}
/**
- * Get the normalized vector, which is the vector divided by its length, as a new vector.
+ * Get the normalized vector, which is the vector divided by its
+ * length, as a new vector.
*
* @return a new vector
*/
@@ -613,7 +585,8 @@ public abstract class BlockVector3 {
}
/**
- * Returns a vector with the absolute values of the components of this vector.
+ * Returns a vector with the absolute values of the components of
+ * this vector.
*
* @return a new vector
*/
@@ -624,16 +597,15 @@ public abstract class BlockVector3 {
/**
* Perform a 2D transformation on this vector and return a new one.
*
- * @param angle in degrees
- * @param aboutX about which x coordinate to rotate
- * @param aboutZ about which z coordinate to rotate
+ * @param angle in degrees
+ * @param aboutX about which x coordinate to rotate
+ * @param aboutZ about which z coordinate to rotate
* @param translateX what to add after rotation
* @param translateZ what to add after rotation
* @return a new vector
* @see AffineTransform another method to transform vectors
*/
- public BlockVector3 transform2D(double angle, double aboutX, double aboutZ, double translateX,
- double translateZ) {
+ public BlockVector3 transform2D(double angle, double aboutX, double aboutZ, double translateX, double translateZ) {
angle = Math.toRadians(angle);
double x = this.getX() - aboutX;
double z = this.getZ() - aboutZ;
@@ -691,9 +663,9 @@ public abstract class BlockVector3 {
*/
public BlockVector3 getMinimum(BlockVector3 v2) {
return new BlockVector3Imp(
- Math.min(getX(), v2.getX()),
- Math.min(getY(), v2.getY()),
- Math.min(getZ(), v2.getZ())
+ Math.min(getX(), v2.getX()),
+ Math.min(getY(), v2.getY()),
+ Math.min(getZ(), v2.getZ())
);
}
@@ -705,9 +677,9 @@ public abstract class BlockVector3 {
*/
public BlockVector3 getMaximum(BlockVector3 v2) {
return new BlockVector3Imp(
- Math.max(getX(), v2.getX()),
- Math.max(getY(), v2.getY()),
- Math.max(getZ(), v2.getZ())
+ Math.max(getX(), v2.getX()),
+ Math.max(getY(), v2.getY()),
+ Math.max(getZ(), v2.getZ())
);
}
@@ -788,7 +760,8 @@ public abstract class BlockVector3 {
return false;
}
- return equals((BlockVector3) obj);
+ BlockVector3 other = (BlockVector3) obj;
+ return other.getX() == this.getX() && other.getY() == this.getY() && other.getZ() == this.getZ();
}
public final boolean equals(BlockVector3 other) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java b/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java
index d9d15008c..91b899ebb 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java
@@ -31,8 +31,8 @@ import java.util.List;
/**
* A Kochanek-Bartels interpolation; continuous in the 2nd derivative.
*
- * Supports Node#tension tension, Node#bias bias and
- * Node#continuity continuity parameters per {@link Node}.
+ * Supports {@link Node#tension tension}, {@link Node#bias bias} and
+ * {@link Node#continuity continuity} parameters per {@link Node}.
*/
public class KochanekBartelsInterpolation implements Interpolation {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java
index 381403e1b..b79dbca1c 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/AbstractRegion.java
@@ -120,6 +120,7 @@ public abstract class AbstractRegion extends AbstractSet implement
(max.getY() - min.getY() + 1) *
(max.getZ() - min.getZ() + 1);
}
+
/**
* Get X-size.
*
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
index ac268256c..7135a6528 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
@@ -412,6 +412,11 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ;
}
+ @Override
+ public boolean contains(BlockVector3 position) {
+ return contains(position.getX(), position.getY(), position.getZ());
+ }
+
@Override
public Iterator iterator() {
if (Settings.IMP.HISTORY.COMPRESSION_LEVEL >= 9 || useOldIterator) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java
index 4e3a9a6e0..53f48baf9 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java
@@ -35,7 +35,6 @@ import com.sk89q.worldedit.math.geom.Polygons;
import com.sk89q.worldedit.regions.iterator.FlatRegion3DIterator;
import com.sk89q.worldedit.regions.iterator.FlatRegionIterator;
import com.sk89q.worldedit.world.World;
-
import java.util.Iterator;
import java.util.List;
@@ -327,6 +326,11 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
return dx * dx + dz * dz <= 1;
}
+ @Override
+ public boolean contains(BlockVector3 position) {
+ return contains(position.getX(), position.getY(), position.getZ());
+ }
+
/**
* Sets the height of the cylinder to fit the specified Y.
*
@@ -411,7 +415,8 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
}
@Override
- public void filter(final IChunk chunk, final Filter filter, final ChunkFilterBlock block, final IChunkGet get, final IChunkSet set) {
+ public void filter(final IChunk chunk, final Filter filter, final ChunkFilterBlock block,
+ final IChunkGet get, final IChunkSet set) {
int bcx = chunk.getX() >> 4;
int bcz = chunk.getZ() >> 4;
int tcx = bcx + 15;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java
index 679047abf..09368b52a 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java
@@ -104,7 +104,7 @@ public class EllipsoidRegion extends AbstractRegion {
@Override
public int getHeight() {
- return Math.max((int) (2 * radius.getY()), 256);
+ return (int) (2 * radius.getY());
}
@Override
@@ -246,6 +246,11 @@ public class EllipsoidRegion extends AbstractRegion {
return cxd + cyd + czd <= 1;
}
+ @Override
+ public boolean contains(BlockVector3 position) {
+ return position.subtract(center).toVector3().divide(radius).lengthSq() <= 1;
+ }
+
@Override
public boolean contains(int x, int z) {
int cx = x - center.getBlockX();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java
index 1406b94e8..6dccae560 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java
@@ -141,9 +141,7 @@ public interface Region extends Iterable, Cloneable {
* @param position the position
* @return true if contained
*/
- default boolean contains(BlockVector3 position) {
- return contains(position.getX(), position.getY(), position.getZ());
- }
+ boolean contains(BlockVector3 position);
/**
* Get a list of chunks.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoCraftScriptEngine.java b/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoCraftScriptEngine.java
index 79d51cefb..8cad2670b 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoCraftScriptEngine.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/scripting/RhinoCraftScriptEngine.java
@@ -50,6 +50,7 @@ public class RhinoCraftScriptEngine implements CraftScriptEngine {
throws ScriptException, Throwable {
RhinoContextFactory factory = new RhinoContextFactory(timeLimit);
Context cx = factory.enterContext();
+ cx.setClassShutter(new MinecraftHidingClassShutter());
ScriptableObject scriptable = new ImporterTopLevel(cx);
Scriptable scope = cx.initStandardObjects(scriptable);
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/ClipboardHolder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/ClipboardHolder.java
index a4d6b5631..faf7db200 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/session/ClipboardHolder.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/session/ClipboardHolder.java
@@ -62,8 +62,8 @@ public class ClipboardHolder {
}
/**
- * Get all currently held clipboards
- * @return
+ * Gets all currently held clipboards.
+ * @return all clipboards being held.
*/
public List getClipboards() {
return Collections.singletonList(getClipboard());
@@ -74,10 +74,10 @@ public class ClipboardHolder {
}
/**
- * Get all end ClipboardHolders
+ * Gets all end ClipboardHolders
* - Usually this will return itself.
* - If this is a multi clipboard, it will return the children
- * @return Set of end ClipboardHolders
+ * @return a List of end ClipboardHolders
*/
public List getHolders() {
return Collections.singletonList(this);
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java
index 70dd62256..d13c58c98 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java
@@ -65,9 +65,10 @@ import org.slf4j.LoggerFactory;
*/
public class SessionManager {
- public static int EXPIRATION_GRACE = 0;
- private static final int FLUSH_PERIOD = 1000 * 60;
- private static final ListeningExecutorService executorService = MoreExecutors.listeningDecorator(EvenMoreExecutors.newBoundedCachedThreadPool(0, 1, 5));
+ public static int EXPIRATION_GRACE = 10 * 60 * 1000;
+ private static final int FLUSH_PERIOD = 1000 * 30;
+ private static final ListeningExecutorService executorService = MoreExecutors.listeningDecorator(
+ EvenMoreExecutors.newBoundedCachedThreadPool(0, 1, 5, "WorldEdit Session Saver - %s"));
private static final Logger log = LoggerFactory.getLogger(SessionManager.class);
private static boolean warnedInvalidTool;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java
index 7645154f8..9e37e4da0 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java
@@ -23,7 +23,6 @@ import com.sk89q.worldedit.IncompleteRegionException;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.MutableBlockVector3;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.regions.NullRegion;
import com.sk89q.worldedit.regions.Region;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/EngineHubPaste.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/EngineHubPaste.java
index ab8ebe029..3a5e01b6e 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/EngineHubPaste.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/EngineHubPaste.java
@@ -54,7 +54,7 @@ public class EngineHubPaste implements Paster {
form.add("content", content);
form.add("from", "enginehub");
- URL url = HttpRequest.url("http://paste.enginehub.org/paste");
+ URL url = HttpRequest.url("https://paste.enginehub.org/paste");
String result = HttpRequest.post(url)
.bodyForm(form)
.execute()
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java
index f6ed36737..5cc6a232e 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java
@@ -47,8 +47,8 @@ import javax.annotation.Nullable;
*/
public class BaseBlock implements BlockStateHolder, TileEntityBlock {
- private final BlockState blockState;
- private final CompoundTag nbtData;
+ private BlockState blockState;
+ @Nullable private CompoundTag nbtData;
@Deprecated
public BaseBlock() {
@@ -105,25 +105,6 @@ public class BaseBlock implements BlockStateHolder, TileEntityBlock {
return blockState;
}
- protected BaseBlock(int internalId, CompoundTag nbtData) {
- this(BlockState.getFromInternalId(internalId), nbtData);
- }
-
- @Deprecated
- public static BaseBlock getFromInternalId(int internalId, CompoundTag nbtData) {
- return BlockState.getFromInternalId(internalId).toBaseBlock(nbtData);
- }
-
- /**
- * Create a clone of another block.
- *
- * @param other the other block
- */
- @Deprecated
- public BaseBlock(BaseBlock other) {
- this(other.toImmutableState(), other.getNbtData());
- }
-
/**
* Gets a map of state to statevalue
*
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
index 5b8e12032..e76db1bb1 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
@@ -34,11 +34,6 @@ import java.util.stream.Collectors;
public interface BlockStateHolder> extends FawePattern, TileEntityBlock {
- @Override
- default BaseBlock apply(BlockVector3 position) {
- return this.toBaseBlock();
- }
-
/**
* Get the block type
*
@@ -68,13 +63,13 @@ public interface BlockStateHolder> extends FawePat
char getOrdinalChar();
BlockMaterial getMaterial();
+
/**
* Get type id (legacy uses)
* @return
*/
@Deprecated
int getInternalBlockTypeId();
-
/**
* Get the block data (legacy uses)
* @return
@@ -153,6 +148,11 @@ public interface BlockStateHolder> extends FawePat
*/
BaseBlock toBaseBlock(CompoundTag compoundTag);
+ @Override
+ default BaseBlock apply(BlockVector3 position) {
+ return toBaseBlock();
+ }
+
/**
* Return the name of the title entity ID.
*
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
index 2b6b1c155..11302a619 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
@@ -37,12 +37,10 @@ import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.world.registry.LegacyMapper;
-
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.annotation.Nullable;
@@ -103,18 +101,6 @@ public class BlockType implements FawePattern, Keyed {
}
}
- public BlockState withProperties(String properties) { //
- int id = getInternalId();
- for (String keyPair : properties.split(",")) {
- String[] split = keyPair.split("=");
- String name = split[0];
- String value = split[1];
- AbstractProperty btp = settings.propertiesMap.get(name);
- id = btp.modify(id, btp.getValueFor(value));
- }
- return withStateId(id);
- }
-
@Deprecated
public BlockState withPropertyId(int propertyId) {
if (settings.stateOrdinals == null) return settings.defaultState;
@@ -177,14 +163,10 @@ public class BlockType implements FawePattern, Keyed {
*
* @return The default state
*/
- public final BlockState getDefaultState() {
+ public BlockState getDefaultState() {
return this.settings.defaultState;
}
- /**
- * @Deprecated use a Mask instead
- * @return
- */
@Deprecated
public FuzzyBlockState getFuzzyMatcher() {
return new FuzzyBlockState(this);
@@ -305,10 +287,6 @@ public class BlockType implements FawePattern, Keyed {
return this.getDefaultState().toBaseBlock();
}
- public SingleBlockTypeMask toMask() {
- return toMask(null);
- }
-
public SingleBlockTypeMask toMask(Extent extent) {
return new SingleBlockTypeMask(extent, this);
}
diff --git a/worldedit-libs/core/ap/build.gradle.kts b/worldedit-libs/core/ap/build.gradle.kts
index 10c52bd7b..cfac0cf24 100644
--- a/worldedit-libs/core/ap/build.gradle.kts
+++ b/worldedit-libs/core/ap/build.gradle.kts
@@ -4,6 +4,6 @@ dependencies {
"shade"("FAWE-Piston:core/build/libs/core-${Versions.PISTON}:lastSuccessfulBuild@jar")
"shade"("FAWE-Piston:core-ap/annotations/build/libs/annotations-${Versions.PISTON}:lastSuccessfulBuild@jar")
"shade"("FAWE-Piston:core-ap/processor/build/libs/processor-${Versions.PISTON}:lastSuccessfulBuild@jar")
- "shade"("org.enginehub.piston.core-ap:annotations:0.4.3")
- "shade"("org.enginehub.piston.core-ap:processor:0.4.3")
+ "shade"("org.enginehub.piston.core-ap:annotations:${Versions.PISTON}")
+ "shade"("org.enginehub.piston.core-ap:processor:${Versions.PISTON}")
}