Added a new region-based mask type and the ability to combine masks.

This commit is contained in:
sk89q 2011-06-04 11:57:40 -07:00
parent 504b4a613f
commit e1da7c41ad
3 changed files with 48 additions and 6 deletions

View File

@ -403,13 +403,13 @@ public class WorldEdit {
* blocks to include when replacing. * blocks to include when replacing.
* *
* @param player * @param player
* @param session
* @param maskString * @param maskString
* @return * @return
* @throws UnknownItemException * @throws WorldEditException
* @throws DisallowedItemException
*/ */
public Mask getBlockMask(LocalPlayer player, String maskString) public Mask getBlockMask(LocalPlayer player, LocalSession session,
throws UnknownItemException, DisallowedItemException { String maskString) throws WorldEditException {
Mask mask = null; Mask mask = null;
for (String component : maskString.split(" ")) { for (String component : maskString.split(" ")) {
@ -418,6 +418,10 @@ public class WorldEdit {
if (component.charAt(0) == '#') { if (component.charAt(0) == '#') {
if (component.equalsIgnoreCase("#existing")) { if (component.equalsIgnoreCase("#existing")) {
current = new ExistingBlockMask(); current = new ExistingBlockMask();
} else if (component.equalsIgnoreCase("#selection")
|| component.equalsIgnoreCase("#region")
|| component.equalsIgnoreCase("#sel")) {
current = new RegionMask(session.getSelection(player.getWorld()));
} else { } else {
throw new UnknownItemException(component); throw new UnknownItemException(component);
} }

View File

@ -77,7 +77,7 @@ public class ToolUtilCommands {
usage = "[mask]", usage = "[mask]",
desc = "Set the brush mask", desc = "Set the brush mask",
min = 0, min = 0,
max = 1 max = -1
) )
@CommandPermissions({"worldedit.brush.options.mask"}) @CommandPermissions({"worldedit.brush.options.mask"})
public static void mask(CommandContext args, WorldEdit we, public static void mask(CommandContext args, WorldEdit we,
@ -87,7 +87,7 @@ public class ToolUtilCommands {
session.getBrushTool(player.getItemInHand()).setMask(null); session.getBrushTool(player.getItemInHand()).setMask(null);
player.print("Brush mask disabled."); player.print("Brush mask disabled.");
} else { } else {
Mask mask = we.getBlockMask(player, args.getJoinedStrings(0)); Mask mask = we.getBlockMask(player, session, args.getJoinedStrings(0));
session.getBrushTool(player.getItemInHand()).setMask(mask); session.getBrushTool(player.getItemInHand()).setMask(mask);
player.print("Brush mask set."); player.print("Brush mask set.");
} }

View File

@ -0,0 +1,38 @@
// $Id$
/*
* WorldEdit
* Copyright (C) 2010, 2011 sk89q <http://www.sk89q.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.masks;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.regions.Region;
public class RegionMask implements Mask {
private Region region;
public RegionMask(Region region) {
this.region = region;
}
public boolean matches(EditSession editSession, Vector pos) {
return region.contains(pos);
}
}