Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-10 04:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

It started on work with commands then I got carried away.

Browse Source
This commit is contained in:
MattBDev
2019-07-25 14:44:10 -04:00
parent 01c371df9c
commit ff5860113d
184 changed files with 1694 additions and 2580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector2.java
View File

@ -19,9 +19,7 @@
package com.sk89q.worldedit.math;
import com.google.common.collect.ComparisonChain;
import com.sk89q.worldedit.math.transform.AffineTransform;
import java.util.Comparator;
/**
@ -48,25 +46,31 @@ public class BlockVector2 {
* cdef
* </pre>
*/
public static final Comparator<BlockVector2> COMPARING_GRID_ARRANGEMENT = (a, b) -> {
return ComparisonChain.start()
.compare(a.getBlockZ(), b.getBlockZ())
.compare(a.getBlockX(), b.getBlockX())
.result();
};
public static final Comparator<BlockVector2> COMPARING_GRID_ARRANGEMENT =
Comparator.comparingInt(BlockVector2::getZ).thenComparingInt(BlockVector2::getX);
public static BlockVector2 at(double x, double z) {
return at((int) Math.floor(x), (int) Math.floor(z));
}
public static BlockVector2 at(int x, int z) {
switch (x) {
case 0:
if (z == 0) {
return ZERO;
}
break;
case 1:
if (z == 1) {
return ONE;
}
break;
}
return new BlockVector2(x, z);
}
protected int x, z;
protected BlockVector2(){}
/**
* Construct an instance.
*
@ -342,6 +346,26 @@ public class BlockVector2 {
return divide(n, n);
}
/**
* Shift all components right.
*
* @param x the value to shift x by
* @param z the value to shift z by
* @return a new vector
*/
public BlockVector2 shr(int x, int z) {
return at(this.x >> x, this.z >> z);
}
/**
* Shift all components right by {@code n}.
*
* @param n the value to shift by
* @return a new vector
*/
public BlockVector2 shr(int n) {
return shr(n, n);
}
/**
* Get the length of the vector.
*
@ -572,4 +596,4 @@ public class BlockVector2 {
return "(" + x + ", " + z + ")";
}
}
}

73
worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java
View File

@ -21,14 +21,12 @@ package com.sk89q.worldedit.math;
import static com.google.common.base.Preconditions.checkArgument;
import com.google.common.collect.ComparisonChain;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.transform.AffineTransform;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import java.util.Comparator;
/**
@ -50,11 +48,26 @@ public abstract class BlockVector3 {
}
public static BlockVector3 at(int x, int y, int z) {
// switch for efficiency on typical cases
// in MC y is rarely 0/1 on selections
switch (y) {
case 0:
if (x == 0 && z == 0) {
return ZERO;
}
break;
case 1:
if (x == 1 && z == 1) {
return ONE;
}
break;
}
return new BlockVector3Imp(x, y, z);
}
// thread-safe initialization idiom
private static final class YzxOrderComparator {
private static final Comparator<BlockVector3> YZX_ORDER =
Comparator.comparingInt(BlockVector3::getY)
.thenComparingInt(BlockVector3::getZ)
@ -240,8 +253,7 @@ 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
@ -259,8 +271,7 @@ 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
@ -270,8 +281,7 @@ 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
@ -283,8 +293,7 @@ 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
@ -469,8 +478,7 @@ 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
*/
@ -514,7 +522,8 @@ public abstract class BlockVector3 {
* @return true if the vector is contained
*/
public boolean containedWithin(BlockVector3 min, BlockVector3 max) {
return getX() >= min.getX() && getX() <= max.getX() && getY() >= min.getY() && getY() <= max.getY() && getZ() >= min.getZ() && getZ() <= max.getZ();
return getX() >= min.getX() && getX() <= max.getX() && getY() >= min.getY() && getY() <= max
.getY() && getZ() >= min.getZ() && getZ() <= max.getZ();
}
/**
@ -568,8 +577,7 @@ 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
*/
@ -580,15 +588,16 @@ 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;
@ -599,7 +608,7 @@ public abstract class BlockVector3 {
return BlockVector3.at(
x2 + aboutX + translateX,
getY(),
getY(),
z2 + aboutZ + translateZ
);
}
@ -646,9 +655,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())
);
}
@ -660,9 +669,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())
);
}
@ -685,7 +694,7 @@ public abstract class BlockVector3 {
}
public boolean setFullBlock(Extent orDefault, BaseBlock block) {
return orDefault.setBlock(this, block);
return orDefault.setBlock(this, block);
}
public boolean setBiome(Extent orDefault, BiomeType biome) {
@ -724,11 +733,6 @@ public abstract class BlockVector3 {
return orDefault.getBlock(getX(), getY() + y, getZ());
}
/*
Adapt
*/
/**
* Creates a 2D vector by dropping the Y component from this vector.
*
@ -743,7 +747,7 @@ public abstract class BlockVector3 {
}
@Override
public final boolean equals(Object obj) {
public boolean equals(Object obj) {
if (!(obj instanceof BlockVector3)) {
return false;
}
@ -752,7 +756,8 @@ public abstract class BlockVector3 {
}
public final boolean equals(BlockVector3 other) {
return other.getX() == this.getX() && other.getY() == this.getY() && other.getZ() == this.getZ();
return other.getX() == this.getX() && other.getY() == this.getY() && other.getZ() == this
.getZ();
}
@Override

3
worldedit-core/src/main/java/com/sk89q/worldedit/math/MutableVector2.java
View File

@ -2,9 +2,6 @@ package com.sk89q.worldedit.math;
public class MutableVector2 extends Vector2 {
public MutableVector2() {
}
/**
* Construct an instance.
*

5
worldedit-core/src/main/java/com/sk89q/worldedit/math/MutableVector3.java
View File

@ -3,9 +3,12 @@ package com.sk89q.worldedit.math;
import com.boydti.fawe.FaweCache;
public class MutableVector3 extends Vector3 {
private double x,y,z;
private double x, y, z;
public MutableVector3() {
}
public static MutableVector3 get(int x, int y, int z) {
return FaweCache.MUTABLE_VECTOR3.get().setComponents(x, y, z);
}

17
worldedit-core/src/main/java/com/sk89q/worldedit/math/Vector2.java
View File

@ -33,13 +33,24 @@ public class Vector2 {
public static final Vector2 ONE = new Vector2(1, 1);
public static Vector2 at(double x, double z) {
int xTrunc = (int) x;
switch (xTrunc) {
case 0:
if (x == 0 && z == 0) {
return ZERO;
}
break;
case 1:
if (x == 1 && z == 1) {
return ONE;
}
break;
}
return new Vector2(x, z);
}
protected double x, z;
protected Vector2(){}
/**
* Construct an instance.
*
@ -491,7 +502,7 @@ public class Vector2 {
@Override
public int hashCode() {
return ((int) x << 16) ^ ((int) z);
return (int) x << 16 ^ (int) z;
}
@Override

15
worldedit-core/src/main/java/com/sk89q/worldedit/math/Vector3.java
View File

@ -39,6 +39,21 @@ public abstract class Vector3 {
public static final Vector3 ONE = Vector3.at(1, 1, 1);
public static Vector3 at(double x, double y, double z) {
// switch for efficiency on typical cases
// in MC y is rarely 0/1 on selections
int yTrunc = (int) y;
switch (yTrunc) {
case 0:
if (x == 0 && y == 0 && z == 0) {
return ZERO;
}
break;
case 1:
if (x == 1 && y == 1 && z == 1) {
return ONE;
}
break;
}
return new Vector3Impl(x, y, z);
}

5
worldedit-core/src/main/java/com/sk89q/worldedit/math/convolution/HeightMap.java
View File

@ -36,6 +36,7 @@ import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.Iterator;
import javax.annotation.Nullable;
/**
* Allows applications of Kernels onto the region's height map.
@ -63,11 +64,11 @@ public class HeightMap {
this(session, region, (Mask) null, false);
}
public HeightMap(EditSession session, Region region, Mask mask) {
public HeightMap(EditSession session, Region region, @Nullable Mask mask) {
this(session, region, mask, false);
}
public HeightMap(EditSession session, Region region, Mask mask, boolean layers) {
public HeightMap(EditSession session, Region region, @Nullable Mask mask, boolean layers) {
checkNotNull(session);
checkNotNull(region);

2
worldedit-core/src/main/java/com/sk89q/worldedit/math/transform/AffineTransform.java
View File

@ -22,8 +22,6 @@ package com.sk89q.worldedit.math.transform;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.MathUtils;
import com.sk89q.worldedit.math.Vector3;
import java.io.IOException;
import java.io.Serializable;
/**