Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 20:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added new Extent-compatible Clipboard and BlockArrayClipboard classes.

Browse Source 
The goal is to replace use of CuboidClipboard with these new classes.

Support for entities, //flip, //rotate, and //distr still needs to be
re-implemented.

DataException was also removed from BaseBlock because The Base(...)
classes should be "dumb" blocks without any validation.
This commit is contained in:
sk89q
2014-06-29 17:47:08 -07:00
parent eee2c5d9f4
commit 09eb36dc5e
21 changed files with 571 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/sk89q/worldedit/function/pattern/ClipboardPattern.java
View File

@ -19,21 +19,18 @@
package com.sk89q.worldedit.function.pattern;
import com.sk89q.worldedit.CuboidClipboard;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* A pattern that reads from {@link CuboidClipboard}.
*
* @deprecated May be removed without notice, but there is no direct replacement yet
* A pattern that reads from {@link Clipboard}.
*/
@Deprecated
public class ClipboardPattern extends AbstractPattern {
private final CuboidClipboard clipboard;
private final Clipboard clipboard;
private final Vector size;
/**
@ -41,10 +38,10 @@ public class ClipboardPattern extends AbstractPattern {
*
* @param clipboard the clipboard
*/
public ClipboardPattern(CuboidClipboard clipboard) {
public ClipboardPattern(Clipboard clipboard) {
checkNotNull(clipboard);
this.clipboard = clipboard;
this.size = clipboard.getSize();
this.size = clipboard.getMaximumPoint().subtract(clipboard.getMinimumPoint()).add(1, 1, 1);
}
@Override
@ -53,7 +50,7 @@ public class ClipboardPattern extends AbstractPattern {
int yp = Math.abs(position.getBlockY()) % size.getBlockY();
int zp = Math.abs(position.getBlockZ()) % size.getBlockZ();
return clipboard.getPoint(new Vector(xp, yp, zp));
return clipboard.getBlock(clipboard.getMinimumPoint().add(new Vector(xp, yp, zp)));
}
}