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

Merge current FAWE master (227d6d91) into new-vector-system

Browse Source 
Signed-off-by: Byron Marohn <combustible@live.com>
This commit is contained in:
Byron Marohn
2019-01-09 22:35:26 -08:00
parent a9919d130c 227d6d9169
commit ab6aed703d
215 changed files with 1876 additions and 2065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-core/src/main/java/com/sk89q/worldedit/regions/TransformRegion.java
View File

@ -28,12 +28,11 @@ import com.sk89q.worldedit.math.transform.Identity;
import com.sk89q.worldedit.math.transform.Transform;
import com.sk89q.worldedit.world.World;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.annotation.Nullable;
/**
* Transforms another region according to a provided vector {@code Transform}.

2
worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegion3DIterator.java
View File

@ -21,8 +21,8 @@ package com.sk89q.worldedit.regions.iterator;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.regions.FlatRegion;
import java.util.Iterator;

7
worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/FlatRegionIterator.java
View File

@ -21,14 +21,11 @@ package com.sk89q.worldedit.regions.iterator;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.regions.Region;
import java.util.Iterator;
import java.util.NoSuchElementException;
import static com.google.common.base.Preconditions.checkNotNull;
public class FlatRegionIterator implements Iterator<BlockVector2> {
@ -75,7 +72,7 @@ public class FlatRegionIterator implements Iterator<BlockVector2> {
@Override
public BlockVector2 next() {
if (!hasNext()) {
throw new NoSuchElementException();
throw new java.util.NoSuchElementException();
}
BlockVector2 answer = new BlockVector2(nextX, nextZ);

3
worldedit-core/src/main/java/com/sk89q/worldedit/regions/iterator/RegionIterator.java
View File

@ -22,12 +22,11 @@ package com.sk89q.worldedit.regions.iterator;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.regions.Region;
import java.util.Iterator;
import static com.google.common.base.Preconditions.checkNotNull;
public class RegionIterator implements Iterator<BlockVector3> {
private final Region region;

2
worldedit-core/src/main/java/com/sk89q/worldedit/regions/polyhedron/Edge.java
View File

@ -23,8 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.math.Vector3;
import static com.google.common.base.Preconditions.checkNotNull;
public class Edge {
private final Vector3 start;

2
worldedit-core/src/main/java/com/sk89q/worldedit/regions/polyhedron/Triangle.java
View File

@ -23,8 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.math.Vector3;
import static com.google.common.base.Preconditions.checkNotNull;
public class Triangle {
private String tag = "Triangle";

1
worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/ExtendingCuboidRegionSelector.java
View File

@ -26,6 +26,7 @@ import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.world.World;
import javax.annotation.Nullable;
/**

1
worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/SphereRegionSelector.java
View File

@ -27,6 +27,7 @@ import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.world.World;
import javax.annotation.Nullable;
/**

5
worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/ArbitraryShape.java
View File

@ -21,11 +21,10 @@ package com.sk89q.worldedit.regions.shape;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.world.block.BlockStateHolder;
/**
* Generates solid and hollow shapes according to materials returned by the
@ -93,4 +92,4 @@ public abstract class ArbitraryShape {
return affected;
}
}
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/RegionShape.java
View File

@ -22,8 +22,6 @@ package com.sk89q.worldedit.regions.shape;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.regions.Region;
/**
* Generates solid and hollow shapes according to materials returned by the