This commit is contained in:
MattBDev
2019-06-25 13:07:47 -04:00
parent a1c15e1c39
commit a69b239848
143 changed files with 1042 additions and 2405 deletions

View File

@ -33,6 +33,7 @@ import java.util.List;
* Holds the clipboard and the current transform on the clipboard.
*/
public class ClipboardHolder {
private Clipboard clipboard;
private Transform transform = new Identity();

View File

@ -1,39 +0,0 @@
package com.sk89q.worldedit.session;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.math.transform.Transform;
public class DelegateClipboardHolder extends ClipboardHolder {
private final ClipboardHolder parent;
public DelegateClipboardHolder(ClipboardHolder holder) {
super(holder.getClipboard());
this.parent = holder;
}
@Override
public Clipboard getClipboard() {
return parent.getClipboard();
}
@Override
public void setTransform(Transform transform) {
parent.setTransform(transform);
}
@Override
public Transform getTransform() {
return parent.getTransform();
}
@Override
public PasteBuilder createPaste(Extent targetExtent) {
return parent.createPaste(targetExtent);
}
@Override
public void close() {
parent.close();
}
}

View File

@ -20,9 +20,9 @@
package com.sk89q.worldedit.session;
import com.boydti.fawe.util.MaskTraverser;
import com.sk89q.worldedit.EditSession;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
@ -35,9 +35,6 @@ import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.transform.Transform;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Builds an operation to paste the contents of a clipboard.
*/
@ -56,10 +53,10 @@ public class PasteBuilder {
/**
* Create a new instance.
*
* @param holder the clipboard holder
* @param targetExtent an extent
* @param holder the clipboard holder
* @param targetExtent an extent
*/
public PasteBuilder(ClipboardHolder holder, Extent targetExtent) {
PasteBuilder(ClipboardHolder holder, Extent targetExtent) {
checkNotNull(holder);
checkNotNull(targetExtent);
this.clipboard = holder.getClipboard();
@ -134,5 +131,4 @@ public class PasteBuilder {
return copy;
}
}