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

Added offset to ClipboardPattern.

Browse Source 
Takes input like '//set #clipboard@-1,0,1' which shifts the pattern over.
It also now extends RepeatingExtentPattern, which was previously unused.
This commit is contained in:
wizjany
2019-02-11 17:40:30 -05:00
committed by Wizjany
parent 76400e533d
commit 19796aa3be
3 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/ClipboardPattern.java
View File

@ -19,19 +19,13 @@
package com.sk89q.worldedit.function.pattern;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.block.BaseBlock;
/**
* A pattern that reads from {@link Clipboard}.
*/
public class ClipboardPattern extends AbstractPattern {
private final Clipboard clipboard;
private final BlockVector3 size;
public class ClipboardPattern extends RepeatingExtentPattern {
/**
* Create a new clipboard pattern.
@ -39,18 +33,16 @@ public class ClipboardPattern extends AbstractPattern {
* @param clipboard the clipboard
*/
public ClipboardPattern(Clipboard clipboard) {
checkNotNull(clipboard);
this.clipboard = clipboard;
this.size = clipboard.getMaximumPoint().subtract(clipboard.getMinimumPoint()).add(1, 1, 1);
this(clipboard, BlockVector3.ZERO);
}
@Override
public BaseBlock apply(BlockVector3 position) {
int xp = Math.abs(position.getBlockX()) % size.getBlockX();
int yp = Math.abs(position.getBlockY()) % size.getBlockY();
int zp = Math.abs(position.getBlockZ()) % size.getBlockZ();
return clipboard.getFullBlock(clipboard.getMinimumPoint().add(xp, yp, zp));
/**
* Create a new clipboard pattern.
*
* @param clipboard the clipboard
* @param offset the offset
*/
public ClipboardPattern(Clipboard clipboard, BlockVector3 offset) {
super(clipboard, clipboard.getMinimumPoint(), offset);
}
}

34
worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RepeatingExtentPattern.java
View File

@ -30,7 +30,9 @@ import com.sk89q.worldedit.world.block.BaseBlock;
*/
public class RepeatingExtentPattern extends AbstractPattern {
private final BlockVector3 size;
private Extent extent;
private BlockVector3 origin;
private BlockVector3 offset;
/**
@ -39,9 +41,11 @@ public class RepeatingExtentPattern extends AbstractPattern {
* @param extent the extent
* @param offset the offset
*/
public RepeatingExtentPattern(Extent extent, BlockVector3 offset) {
public RepeatingExtentPattern(Extent extent, BlockVector3 origin, BlockVector3 offset) {
setExtent(extent);
setOrigin(origin);
setOffset(offset);
size = extent.getMaximumPoint().subtract(extent.getMinimumPoint()).add(1, 1, 1);
}
/**
@ -82,14 +86,32 @@ public class RepeatingExtentPattern extends AbstractPattern {
this.offset = offset;
}
/**
* Get the origin.
*
* @return the origin
*/
public BlockVector3 getOrigin() {
return origin;
}
/**
* Set the origin.
*
* @param origin the origin
*/
public void setOrigin(BlockVector3 origin) {
checkNotNull(origin);
this.origin = origin;
}
@Override
public BaseBlock apply(BlockVector3 position) {
BlockVector3 base = position.add(offset);
BlockVector3 size = extent.getMaximumPoint().subtract(extent.getMinimumPoint()).add(1, 1, 1);
int x = base.getBlockX() % size.getBlockX();
int y = base.getBlockY() % size.getBlockY();
int z = base.getBlockZ() % size.getBlockZ();
return extent.getFullBlock(BlockVector3.at(x, y, z));
int x = Math.abs(base.getBlockX()) % size.getBlockX();
int y = Math.abs(base.getBlockY()) % size.getBlockY();
int z = Math.abs(base.getBlockZ()) % size.getBlockZ();
return extent.getFullBlock(BlockVector3.at(x, y, z).add(origin));
}
}