mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-24 10:17:39 +00:00
Added support for combined masks.
This commit is contained in:
parent
d881c14e2d
commit
504b4a613f
@ -403,27 +403,44 @@ 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 {
|
} else {
|
||||||
throw new UnknownItemException(list);
|
throw new UnknownItemException(component);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (list.charAt(0) == '!' && list.length() > 1) {
|
if (component.charAt(0) == '!' && component.length() > 1) {
|
||||||
return new InvertedBlockTypeMask(
|
current = new InvertedBlockTypeMask(
|
||||||
getBlockIDs(player, list.substring(1), true));
|
getBlockIDs(player, component.substring(1), true));
|
||||||
} else {
|
} else {
|
||||||
return new BlockTypeMask(getBlockIDs(player, list, true));
|
current = new BlockTypeMask(getBlockIDs(player, component, true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mask == null) {
|
||||||
|
mask = current;
|
||||||
|
} else if (mask instanceof CombinedMask) {
|
||||||
|
((CombinedMask) mask).add(current);
|
||||||
|
} else {
|
||||||
|
mask = new CombinedMask(mask);
|
||||||
|
((CombinedMask) mask).add(current);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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.");
|
||||||
}
|
}
|
||||||
|
60
src/main/java/com/sk89q/worldedit/masks/CombinedMask.java
Normal file
60
src/main/java/com/sk89q/worldedit/masks/CombinedMask.java
Normal 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user