Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ReplaceAllPattern anvil command

Browse Source
This commit is contained in:
Jesse Boyd 2016-08-25 14:31:05 +10:00
parent 5ed89f9bb6
commit b34c534bb0
4 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/src/main/java/com/boydti/fawe/command/AnvilCommands.java
View File

@ -10,10 +10,12 @@ import com.boydti.fawe.object.number.LongAdder;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.util.command.binding.Switch;
import com.sk89q.worldedit.util.command.parametric.Optional;
import java.io.File;
@ -44,7 +46,7 @@ public class AnvilCommands {
min = 2,
max = 4
)
@CommandPermissions("worldedit.region.replace")
@CommandPermissions("worldedit.anvil.replaceall")
public void replaceAll(Player player, EditSession editSession, String folder, @Optional String from, String to, @Switch('d') boolean useData) throws WorldEditException {
final FaweBlockMatcher matchFrom;
if (from == null) {
@ -56,7 +58,6 @@ public class AnvilCommands {
matchFrom = FaweBlockMatcher.fromBlocks(worldEdit.getBlocks(player, from, true), useData);
}
final FaweBlockMatcher matchTo = FaweBlockMatcher.setBlocks(worldEdit.getBlocks(player, to, true));
BaseBlock tmp = new BaseBlock(35, 14);
File root = new File(folder + File.separator + "region");
MCAQueue queue = new MCAQueue(folder, root, true);
final LongAdder count = new LongAdder();
@ -71,6 +72,50 @@ public class AnvilCommands {
BBC.VISITOR_BLOCK.send(player, count.longValue());
}
@Command(
aliases = { "/replaceallpattern", "/reap", "/repallpat" },
usage = "<folder> [from-block] <to-pattern>",
desc = "Replace all blocks in the selection with another",
flags = "d",
min = 2,
max = 4
)
@CommandPermissions("worldedit.anvil.replaceall")
public void replaceAllPattern(Player player, EditSession editSession, String folder, @Optional String from, final Pattern to, @Switch('d') boolean useData) throws WorldEditException {
final FaweBlockMatcher matchFrom;
if (from == null) {
matchFrom = FaweBlockMatcher.NOT_AIR;
} else {
if (from.contains(":")) {
useData = true; //override d flag, if they specified data they want it
}
matchFrom = FaweBlockMatcher.fromBlocks(worldEdit.getBlocks(player, from, true), useData);
}
File root = new File(folder + File.separator + "region");
MCAQueue queue = new MCAQueue(folder, root, true);
final LongAdder count = new LongAdder();
queue.filterWorld(new MCAFilter() {
private final Vector mutable = new Vector(0, 0, 0);
@Override
public void applyBlock(int x, int y, int z, BaseBlock block) {
if (matchFrom.apply(block)) {
mutable.x = x;
mutable.y = y;
mutable.z = z;
BaseBlock newBlock = to.apply(mutable);
int currentId = block.getId();
if (FaweCache.hasNBT(currentId)) {
block.setNbtData(null);
}
block.setId(newBlock.getId());
block.setData(newBlock.getData());
count.add(1);
}
}
});
BBC.VISITOR_BLOCK.send(player, count.longValue());
}
@Command(
aliases = { "/countall" },
usage = "<folder> [hasSky] <id>",

4
core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -267,7 +267,7 @@ public class BrushCommands {
max = 1
)
@CommandPermissions("worldedit.brush.copy")
public void copy(Player player, LocalSession session, EditSession editSession, @Optional("5") double radius, @Optional("") final String filename, @Optional("0") final int rotation, @Optional("1") final double yscale) throws WorldEditException {
public void copy(Player player, LocalSession session, EditSession editSession, @Optional("5") double radius) throws WorldEditException {
worldEdit.checkMaxBrushRadius(radius);
BrushTool tool = session.getBrushTool(player.getItemInHand());
tool.setSize(radius);
@ -284,7 +284,7 @@ public class BrushCommands {
min = 2,
max = 99
)
@CommandPermissions("worldedit.brush.copy")
@CommandPermissions("worldedit.brush.command")
public void command(Player player, LocalSession session, EditSession editSession, @Optional("5") double radius, CommandContext args) throws WorldEditException {
BrushTool tool = session.getBrushTool(player.getItemInHand());
String cmd = args.getJoinedStrings(1);

2
core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java
View File

@ -78,7 +78,7 @@ public class HistoryCommands {
BBC.SETTING_DISABLE.send(player, "history.use-database");
return;
}
if (user.equals("#import")) {
if (user.equals("#import") && player.hasPermission("worldedit.history.import")) {
if (!player.hasPermission("fawe.rollback.import")) {
BBC.NO_PERM.send(player, "fawe.rollback.import");
return;

2
core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java
View File

@ -60,7 +60,7 @@ public class ToolCommands {
min = 0,
max = 0
)
@CommandPermissions("worldedit.brush.inspect")
@CommandPermissions("worldedit.tool.inspect")
public void inspectBrush(Player player, LocalSession session, EditSession editSession, @Optional("1") double radius) throws WorldEditException {
session.setTool(player.getItemInHand(), new InspectBrush());
BBC.TOOL_INSPECT.send(player, ItemType.toHeldName(player.getItemInHand()));