mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-07-01 06:31:45 +00:00
1934006d14
Previously, the current request would just get a new EditSession when one was created. Now, a Request is reset before and after: - a command is used and - an interact is fired with the platform This means each action taken will get a single, non-reusable Request. Note that this only applies to actions taken through the platform. API users will not be using requests anyway, since things like Masks, etc. will be constructed directly instead of being passed through the platform's parsers and so on. (e.g. if a plugin loads a schematic into the world with a mask, they should create the EditSession and mask it directly, and not use that Mask again for another EditSession in another World). Also, get rid of a bunch of (some now-)unnecessary EditSession creation during command dispatching. Note that this also fixed the dynamic selection mask, which apparently has been broken for some unknown amount of time.
236 lines
10 KiB
Java
236 lines
10 KiB
Java
/*
|
|
* WorldEdit, a Minecraft world manipulation toolkit
|
|
* Copyright (C) sk89q <http://www.sk89q.com>
|
|
* Copyright (C) WorldEdit team and contributors
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify it
|
|
* under the terms of the GNU Lesser General Public License as published by the
|
|
* Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
|
|
* for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
package com.sk89q.worldedit.command;
|
|
|
|
import static com.google.common.base.Preconditions.checkNotNull;
|
|
import static com.sk89q.minecraft.util.commands.Logging.LogMode.PLACEMENT;
|
|
import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
|
|
|
|
import com.sk89q.minecraft.util.commands.Command;
|
|
import com.sk89q.minecraft.util.commands.CommandPermissions;
|
|
import com.sk89q.minecraft.util.commands.Logging;
|
|
import com.sk89q.worldedit.EditSession;
|
|
import com.sk89q.worldedit.LocalSession;
|
|
import com.sk89q.worldedit.WorldEdit;
|
|
import com.sk89q.worldedit.WorldEditException;
|
|
import com.sk89q.worldedit.entity.Player;
|
|
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
|
|
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
|
import com.sk89q.worldedit.function.block.BlockReplace;
|
|
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.function.operation.Operations;
|
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
|
import com.sk89q.worldedit.internal.annotation.Direction;
|
|
import com.sk89q.worldedit.internal.annotation.Selection;
|
|
import com.sk89q.worldedit.math.BlockVector3;
|
|
import com.sk89q.worldedit.math.Vector3;
|
|
import com.sk89q.worldedit.math.transform.AffineTransform;
|
|
import com.sk89q.worldedit.regions.Region;
|
|
import com.sk89q.worldedit.regions.RegionSelector;
|
|
import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
|
|
import com.sk89q.worldedit.session.ClipboardHolder;
|
|
import com.sk89q.worldedit.util.command.binding.Switch;
|
|
import com.sk89q.worldedit.util.command.parametric.Optional;
|
|
|
|
/**
|
|
* Clipboard commands.
|
|
*/
|
|
public class ClipboardCommands {
|
|
|
|
private final WorldEdit worldEdit;
|
|
|
|
/**
|
|
* Create a new instance.
|
|
*
|
|
* @param worldEdit reference to WorldEdit
|
|
*/
|
|
public ClipboardCommands(WorldEdit worldEdit) {
|
|
checkNotNull(worldEdit);
|
|
this.worldEdit = worldEdit;
|
|
}
|
|
|
|
@Command(
|
|
aliases = { "/copy" },
|
|
flags = "em",
|
|
desc = "Copy the selection to the clipboard",
|
|
help = "Copy the selection to the clipboard\n" +
|
|
"Flags:\n" +
|
|
" -e will also copy entities\n" +
|
|
" -m sets a source mask so that excluded blocks become air\n" +
|
|
"WARNING: Pasting entities cannot yet be undone!",
|
|
min = 0,
|
|
max = 0
|
|
)
|
|
@CommandPermissions("worldedit.clipboard.copy")
|
|
public void copy(Player player, LocalSession session, EditSession editSession,
|
|
@Selection Region region, @Switch('e') boolean copyEntities,
|
|
@Switch('m') Mask mask) throws WorldEditException {
|
|
|
|
BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
|
|
clipboard.setOrigin(session.getPlacementPosition(player));
|
|
ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint());
|
|
copy.setCopyingEntities(copyEntities);
|
|
if (mask != null) {
|
|
copy.setSourceMask(mask);
|
|
}
|
|
Operations.completeLegacy(copy);
|
|
session.setClipboard(new ClipboardHolder(clipboard));
|
|
|
|
player.print(region.getArea() + " block(s) were copied.");
|
|
}
|
|
|
|
@Command(
|
|
aliases = { "/cut" },
|
|
flags = "em",
|
|
usage = "[leave-id]",
|
|
desc = "Cut the selection to the clipboard",
|
|
help = "Copy the selection to the clipboard\n" +
|
|
"Flags:\n" +
|
|
" -e will also cut entities\n" +
|
|
" -m sets a source mask so that excluded blocks become air\n" +
|
|
"WARNING: Cutting and pasting entities cannot yet be undone!",
|
|
max = 1
|
|
)
|
|
@CommandPermissions("worldedit.clipboard.cut")
|
|
@Logging(REGION)
|
|
public void cut(Player player, LocalSession session, EditSession editSession,
|
|
@Selection Region region, @Optional("air") Pattern leavePattern, @Switch('e') boolean copyEntities,
|
|
@Switch('m') Mask mask) throws WorldEditException {
|
|
|
|
BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
|
|
clipboard.setOrigin(session.getPlacementPosition(player));
|
|
ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint());
|
|
copy.setSourceFunction(new BlockReplace(editSession, leavePattern));
|
|
copy.setCopyingEntities(copyEntities);
|
|
copy.setRemovingEntities(true);
|
|
if (mask != null) {
|
|
copy.setSourceMask(mask);
|
|
}
|
|
Operations.completeLegacy(copy);
|
|
session.setClipboard(new ClipboardHolder(clipboard));
|
|
|
|
player.print(region.getArea() + " block(s) were cut.");
|
|
}
|
|
|
|
@Command(
|
|
aliases = { "/paste" },
|
|
usage = "",
|
|
flags = "sao",
|
|
desc = "Paste the clipboard's contents",
|
|
help =
|
|
"Pastes the clipboard's contents.\n" +
|
|
"Flags:\n" +
|
|
" -a skips air blocks\n" +
|
|
" -o pastes at the original position\n" +
|
|
" -s selects the region after pasting",
|
|
min = 0,
|
|
max = 0
|
|
)
|
|
@CommandPermissions("worldedit.clipboard.paste")
|
|
@Logging(PLACEMENT)
|
|
public void paste(Player player, LocalSession session, EditSession editSession,
|
|
@Switch('a') boolean ignoreAirBlocks, @Switch('o') boolean atOrigin,
|
|
@Switch('s') boolean selectPasted) throws WorldEditException {
|
|
|
|
ClipboardHolder holder = session.getClipboard();
|
|
Clipboard clipboard = holder.getClipboard();
|
|
Region region = clipboard.getRegion();
|
|
|
|
BlockVector3 to = atOrigin ? clipboard.getOrigin() : session.getPlacementPosition(player);
|
|
Operation operation = holder
|
|
.createPaste(editSession)
|
|
.to(to)
|
|
.ignoreAirBlocks(ignoreAirBlocks)
|
|
.build();
|
|
Operations.completeLegacy(operation);
|
|
|
|
if (selectPasted) {
|
|
BlockVector3 clipboardOffset = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin());
|
|
Vector3 realTo = to.toVector3().add(holder.getTransform().apply(clipboardOffset.toVector3()));
|
|
Vector3 max = realTo.add(holder.getTransform().apply(region.getMaximumPoint().subtract(region.getMinimumPoint()).toVector3()));
|
|
RegionSelector selector = new CuboidRegionSelector(player.getWorld(), realTo.toBlockPoint(), max.toBlockPoint());
|
|
session.setRegionSelector(player.getWorld(), selector);
|
|
selector.learnChanges();
|
|
selector.explainRegionAdjust(player, session);
|
|
}
|
|
|
|
player.print("The clipboard has been pasted at " + to);
|
|
}
|
|
|
|
@Command(
|
|
aliases = { "/rotate" },
|
|
usage = "<y-axis> [<x-axis>] [<z-axis>]",
|
|
desc = "Rotate the contents of the clipboard",
|
|
help = "Non-destructively rotate the contents of the clipboard.\n" +
|
|
"Angles are provided in degrees and a positive angle will result in a clockwise rotation. " +
|
|
"Multiple rotations can be stacked. Interpolation is not performed so angles should be a multiple of 90 degrees.\n"
|
|
)
|
|
@CommandPermissions("worldedit.clipboard.rotate")
|
|
public void rotate(Player player, LocalSession session, Double yRotate, @Optional Double xRotate, @Optional Double zRotate) throws WorldEditException {
|
|
if ((yRotate != null && Math.abs(yRotate % 90) > 0.001) ||
|
|
xRotate != null && Math.abs(xRotate % 90) > 0.001 ||
|
|
zRotate != null && Math.abs(zRotate % 90) > 0.001) {
|
|
player.printDebug("Note: Interpolation is not yet supported, so angles that are multiples of 90 is recommended.");
|
|
}
|
|
|
|
ClipboardHolder holder = session.getClipboard();
|
|
AffineTransform transform = new AffineTransform();
|
|
transform = transform.rotateY(-(yRotate != null ? yRotate : 0));
|
|
transform = transform.rotateX(-(xRotate != null ? xRotate : 0));
|
|
transform = transform.rotateZ(-(zRotate != null ? zRotate : 0));
|
|
holder.setTransform(holder.getTransform().combine(transform));
|
|
player.print("The clipboard copy has been rotated.");
|
|
}
|
|
|
|
@Command(
|
|
aliases = { "/flip" },
|
|
usage = "[<direction>]",
|
|
desc = "Flip the contents of the clipboard",
|
|
help =
|
|
"Flips the contents of the clipboard across the point from which the copy was made.\n",
|
|
min = 0,
|
|
max = 1
|
|
)
|
|
@CommandPermissions("worldedit.clipboard.flip")
|
|
public void flip(Player player, LocalSession session,
|
|
@Optional(Direction.AIM) @Direction BlockVector3 direction) throws WorldEditException {
|
|
ClipboardHolder holder = session.getClipboard();
|
|
AffineTransform transform = new AffineTransform();
|
|
transform = transform.scale(direction.abs().multiply(-2).add(1, 1, 1).toVector3());
|
|
holder.setTransform(holder.getTransform().combine(transform));
|
|
player.print("The clipboard copy has been flipped.");
|
|
}
|
|
|
|
@Command(
|
|
aliases = { "clearclipboard" },
|
|
usage = "",
|
|
desc = "Clear your clipboard",
|
|
min = 0,
|
|
max = 0
|
|
)
|
|
@CommandPermissions("worldedit.clipboard.clear")
|
|
public void clearClipboard(Player player, LocalSession session) throws WorldEditException {
|
|
session.setClipboard(null);
|
|
player.print("Clipboard cleared.");
|
|
}
|
|
}
|