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

Current progress with update

Browse Source
This commit is contained in:
IronApollo
2018-12-23 11:19:33 -05:00
parent 9896a1339e
commit d4157b7e0e
417 changed files with 8994 additions and 4644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-core/src/main/java/com/sk89q/worldedit/session/PasteBuilder.java
View File

@ -19,9 +19,14 @@
package com.sk89q.worldedit.session;
<<<<<<< HEAD
import com.boydti.fawe.util.MaskTraverser;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
=======
import static com.google.common.base.Preconditions.checkNotNull;
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
@ -31,6 +36,7 @@ import com.sk89q.worldedit.function.mask.ExistingBlockMask;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.transform.Transform;
@ -45,7 +51,7 @@ public class PasteBuilder {
private final Transform transform;
private final Extent targetExtent;
private Vector to = new Vector();
private BlockVector3 to = BlockVector3.ZERO;
private boolean ignoreAirBlocks;
private boolean ignoreBiomes;
private boolean ignoreEntities;
@ -71,7 +77,7 @@ public class PasteBuilder {
* @param to the target location
* @return this builder instance
*/
public PasteBuilder to(Vector to) {
public PasteBuilder to(BlockVector3 to) {
this.to = to;
return this;
}

30
worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java
View File

@ -19,7 +19,15 @@
package com.sk89q.worldedit.session.request;
<<<<<<< HEAD
import com.sk89q.worldedit.*;
=======
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.Vector3;
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
import com.sk89q.worldedit.regions.NullRegion;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionOperationException;
@ -59,17 +67,17 @@ public class RequestSelection implements Region {
}
@Override
public Vector getMinimumPoint() {
public BlockVector3 getMinimumPoint() {
return getRegion().getMinimumPoint();
}
@Override
public Vector getMaximumPoint() {
public BlockVector3 getMaximumPoint() {
return getRegion().getMaximumPoint();
}
@Override
public Vector getCenter() {
public Vector3 getCenter() {
return getRegion().getCenter();
}
@ -94,32 +102,32 @@ public class RequestSelection implements Region {
}
@Override
public void expand(Vector... changes) throws RegionOperationException {
public void expand(BlockVector3... changes) throws RegionOperationException {
getRegion().expand(changes);
}
@Override
public void contract(Vector... changes) throws RegionOperationException {
public void contract(BlockVector3... changes) throws RegionOperationException {
getRegion().contract(changes);
}
@Override
public void shift(Vector change) throws RegionOperationException {
public void shift(BlockVector3 change) throws RegionOperationException {
getRegion().shift(change);
}
@Override
public boolean contains(Vector position) {
public boolean contains(BlockVector3 position) {
return getRegion().contains(position);
}
@Override
public Set<Vector2D> getChunks() {
public Set<BlockVector2> getChunks() {
return getRegion().getChunks();
}
@Override
public Set<Vector> getChunkCubes() {
public Set<BlockVector3> getChunkCubes() {
return getRegion().getChunkCubes();
}
@ -139,12 +147,12 @@ public class RequestSelection implements Region {
}
@Override
public List<BlockVector2D> polygonize(int maxPoints) {
public List<BlockVector2> polygonize(int maxPoints) {
return getRegion().polygonize(maxPoints);
}
@Override
public Iterator<BlockVector> iterator() {
public Iterator<BlockVector3> iterator() {
return getRegion().iterator();
}