mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-23 09:47:38 +00:00
Minor upstream changes
This commit is contained in:
parent
a4802c57ae
commit
3caf53987f
@ -4,6 +4,7 @@ import com.sk89q.worldedit.extent.AbstractDelegateExtent;
|
|||||||
import com.sk89q.worldedit.extent.Extent;
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class ExtentTraverser<T extends Extent> {
|
public class ExtentTraverser<T extends Extent> {
|
||||||
@ -48,21 +49,8 @@ public class ExtentTraverser<T extends Extent> {
|
|||||||
return last;
|
return last;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean insert(T extent) {
|
|
||||||
try {
|
|
||||||
Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(extent, field.get(root));
|
|
||||||
field.set(root, extent);
|
|
||||||
return true;
|
|
||||||
} catch (Throwable e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public <U> U findAndGet(Class<U> clazz) {
|
public <U> U findAndGet(Class<U> clazz) {
|
||||||
ExtentTraverser<Extent> traverser = find( clazz);
|
ExtentTraverser<Extent> traverser = find(clazz);
|
||||||
return (traverser != null) ? (U) traverser.get() : null;
|
return (traverser != null) ? (U) traverser.get() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1102,7 +1102,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
|
|||||||
* @param radius the radius of the spherical area to fill
|
* @param radius the radius of the spherical area to fill
|
||||||
* @param depth the maximum depth, starting from the origin
|
* @param depth the maximum depth, starting from the origin
|
||||||
* @param direction the direction to fill
|
* @param direction the direction to fill
|
||||||
* @return number of blocks affected
|
* @return the number of blocks affected
|
||||||
* @throws MaxChangedBlocksException thrown if too many blocks are changed
|
* @throws MaxChangedBlocksException thrown if too many blocks are changed
|
||||||
*/
|
*/
|
||||||
public int fillDirection(final BlockVector3 origin, final Pattern pattern, final double radius, final int depth, BlockVector3 direction) throws MaxChangedBlocksException {
|
public int fillDirection(final BlockVector3 origin, final Pattern pattern, final double radius, final int depth, BlockVector3 direction) throws MaxChangedBlocksException {
|
||||||
@ -1181,7 +1181,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
|
|||||||
visitor.visit(origin);
|
visitor.visit(origin);
|
||||||
|
|
||||||
// Execute
|
// Execute
|
||||||
Operations.completeBlindly(visitor);
|
Operations.completeLegacy(visitor);
|
||||||
|
|
||||||
return this.changes = visitor.getAffected();
|
return this.changes = visitor.getAffected();
|
||||||
}
|
}
|
||||||
@ -2185,10 +2185,11 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
|
|||||||
*
|
*
|
||||||
* @param position a position
|
* @param position a position
|
||||||
* @param radius a radius
|
* @param radius a radius
|
||||||
* @param onlyNormalDirt only affect normal dirt (data value 0)
|
* @param onlyNormalDirt only affect normal dirt (all default properties)
|
||||||
* @return number of blocks affected
|
* @return number of blocks affected
|
||||||
* @throws MaxChangedBlocksException thrown if too many blocks are changed
|
* @throws MaxChangedBlocksException thrown if too many blocks are changed
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public int green(BlockVector3 position, double radius, boolean onlyNormalDirt)
|
public int green(BlockVector3 position, double radius, boolean onlyNormalDirt)
|
||||||
throws MaxChangedBlocksException {
|
throws MaxChangedBlocksException {
|
||||||
final double radiusSq = radius * radius;
|
final double radiusSq = radius * radius;
|
||||||
@ -2257,7 +2258,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
|
|||||||
GroundFunction ground = new GroundFunction(new ExistingBlockMask(this), generator);
|
GroundFunction ground = new GroundFunction(new ExistingBlockMask(this), generator);
|
||||||
LayerVisitor visitor = new LayerVisitor(region, minimumBlockY(region), maximumBlockY(region), ground);
|
LayerVisitor visitor = new LayerVisitor(region, minimumBlockY(region), maximumBlockY(region), ground);
|
||||||
visitor.setMask(new NoiseFilter2D(new RandomNoise(), density));
|
visitor.setMask(new NoiseFilter2D(new RandomNoise(), density));
|
||||||
Operations.completeBlindly(visitor);
|
Operations.completeLegacy(visitor);
|
||||||
return this.changes = ground.getAffected();
|
return this.changes = ground.getAffected();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2403,11 +2404,42 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
|
|||||||
return changed;
|
return changed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deforms the region by a given expression. A deform provides a block's x, y, and z coordinates (possibly scaled)
|
||||||
|
* to an expression, and then sets the block to the block given by the resulting values of the variables, if they
|
||||||
|
* have changed.
|
||||||
|
*
|
||||||
|
* @param region the region to deform
|
||||||
|
* @param zero the origin of the coordinate system
|
||||||
|
* @param unit the scale of the coordinate system
|
||||||
|
* @param expressionString the expression to evaluate for each block
|
||||||
|
*
|
||||||
|
* @return number of blocks changed
|
||||||
|
*
|
||||||
|
* @throws ExpressionException thrown on invalid expression input
|
||||||
|
* @throws MaxChangedBlocksException thrown if too many blocks are changed
|
||||||
|
*/
|
||||||
public int deformRegion(final Region region, final Vector3 zero, final Vector3 unit, final String expressionString)
|
public int deformRegion(final Region region, final Vector3 zero, final Vector3 unit, final String expressionString)
|
||||||
throws ExpressionException, MaxChangedBlocksException {
|
throws ExpressionException, MaxChangedBlocksException {
|
||||||
return deformRegion(region, zero, unit, expressionString, WorldEdit.getInstance().getConfiguration().calculationTimeout);
|
return deformRegion(region, zero, unit, expressionString, WorldEdit.getInstance().getConfiguration().calculationTimeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deforms the region by a given expression. A deform provides a block's x, y, and z coordinates (possibly scaled)
|
||||||
|
* to an expression, and then sets the block to the block given by the resulting values of the variables, if they
|
||||||
|
* have changed.
|
||||||
|
*
|
||||||
|
* @param region the region to deform
|
||||||
|
* @param zero the origin of the coordinate system
|
||||||
|
* @param unit the scale of the coordinate system
|
||||||
|
* @param expressionString the expression to evaluate for each block
|
||||||
|
* @param timeout maximum time for the expression to evaluate for each block. -1 for unlimited.
|
||||||
|
*
|
||||||
|
* @return number of blocks changed
|
||||||
|
*
|
||||||
|
* @throws ExpressionException thrown on invalid expression input
|
||||||
|
* @throws MaxChangedBlocksException thrown if too many blocks are changed
|
||||||
|
*/
|
||||||
public int deformRegion(final Region region, final Vector3 zero, final Vector3 unit, final String expressionString,
|
public int deformRegion(final Region region, final Vector3 zero, final Vector3 unit, final String expressionString,
|
||||||
final int timeout) throws ExpressionException, MaxChangedBlocksException {
|
final int timeout) throws ExpressionException, MaxChangedBlocksException {
|
||||||
final Expression expression = Expression.compile(expressionString, "x", "y", "z");
|
final Expression expression = Expression.compile(expressionString, "x", "y", "z");
|
||||||
@ -2425,7 +2457,6 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
|
|||||||
final Vector3 zero2 = zero.add(0.5, 0.5, 0.5);
|
final Vector3 zero2 = zero.add(0.5, 0.5, 0.5);
|
||||||
|
|
||||||
RegionVisitor visitor = new RegionVisitor(region, new RegionFunction() {
|
RegionVisitor visitor = new RegionVisitor(region, new RegionFunction() {
|
||||||
private final MutableBlockVector3 mutable = new MutableBlockVector3();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean apply(BlockVector3 position) throws WorldEditException {
|
public boolean apply(BlockVector3 position) throws WorldEditException {
|
||||||
|
Loading…
Reference in New Issue
Block a user