Added support for combined masks.

This commit is contained in:
sk89q 2011-06-04 11:42:45 -07:00
parent d881c14e2d
commit 504b4a613f
3 changed files with 90 additions and 13 deletions

View File

@ -403,33 +403,50 @@ public class WorldEdit {
* blocks to include when replacing. * blocks to include when replacing.
* *
* @param player * @param player
* @param list * @param maskString
* @return * @return
* @throws UnknownItemException * @throws UnknownItemException
* @throws DisallowedItemException * @throws DisallowedItemException
*/ */
public Mask getBlockMask(LocalPlayer player, String list) public Mask getBlockMask(LocalPlayer player, String maskString)
throws UnknownItemException, DisallowedItemException { throws UnknownItemException, DisallowedItemException {
if (list.charAt(0) == '#') { Mask mask = null;
if (list.equalsIgnoreCase("#existing")) {
return new ExistingBlockMask(); for (String component : maskString.split(" ")) {
Mask current = null;
if (component.charAt(0) == '#') {
if (component.equalsIgnoreCase("#existing")) {
current = new ExistingBlockMask();
} else {
throw new UnknownItemException(component);
}
} else { } else {
throw new UnknownItemException(list); if (component.charAt(0) == '!' && component.length() > 1) {
current = new InvertedBlockTypeMask(
getBlockIDs(player, component.substring(1), true));
} else {
current = new BlockTypeMask(getBlockIDs(player, component, true));
}
} }
} else {
if (list.charAt(0) == '!' && list.length() > 1) { if (mask == null) {
return new InvertedBlockTypeMask( mask = current;
getBlockIDs(player, list.substring(1), true)); } else if (mask instanceof CombinedMask) {
((CombinedMask) mask).add(current);
} else { } else {
return new BlockTypeMask(getBlockIDs(player, list, true)); mask = new CombinedMask(mask);
((CombinedMask) mask).add(current);
} }
} }
return mask;
} }
/** /**
* Get a list of blocks as a set. * Get a list of blocks as a set.
* *
*@param player * @param player
* @param list * @param list
* @param allBlocksAllowed * @param allBlocksAllowed
* @return set * @return set

View File

@ -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.getString(0)); Mask mask = we.getBlockMask(player, 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,60 @@
// $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 java.util.ArrayList;
import java.util.List;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector;
public class CombinedMask implements Mask {
private List<Mask> masks = new ArrayList<Mask>();
public CombinedMask() {
}
public CombinedMask(Mask mask) {
masks.add(mask);
}
public void add(Mask mask) {
masks.add(mask);
}
public boolean remove(Mask mask) {
return masks.remove(mask);
}
public boolean has(Mask mask) {
return masks.contains(mask);
}
public boolean matches(EditSession editSession, Vector pos) {
for (Mask mask : masks) {
if (!mask.matches(editSession, pos)) {
return false;
}
}
return true;
}
}