Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-27 03:12:37 +01:00
Created pattern, mask, and block registries.
Deprecated getBlock, getBlockPattern, and so-on in WorldEdit.
Dieser Commit ist enthalten in:
sk89q
Ursprung
589c3e9629
Commit
9d08f266bf
@ -1,12 +1,13 @@
|
|||||||
package com.sk89q.worldedit.masks;
|
package com.sk89q.worldedit.masks;
|
||||||
|
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.*;
|
||||||
import com.sk89q.worldedit.IncompleteRegionException;
|
|
||||||
import com.sk89q.worldedit.LocalPlayer;
|
|
||||||
import com.sk89q.worldedit.LocalSession;
|
|
||||||
import com.sk89q.worldedit.Vector;
|
|
||||||
import com.sk89q.worldedit.regions.Region;
|
import com.sk89q.worldedit.regions.Region;
|
||||||
|
import com.sk89q.worldedit.session.request.RequestSelection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use {@link RequestSelection} with {@link com.sk89q.worldedit.function.mask.RegionMask}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
public class DynamicRegionMask extends AbstractMask {
|
public class DynamicRegionMask extends AbstractMask {
|
||||||
private Region region;
|
private Region region;
|
||||||
|
|
||||||
|
|||||||
@ -24,13 +24,16 @@ import com.sk89q.worldedit.LocalPlayer;
|
|||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
||||||
import com.sk89q.worldedit.Vector;
|
import com.sk89q.worldedit.Vector;
|
||||||
import com.sk89q.worldedit.blocks.BaseBlock;
|
import com.sk89q.worldedit.blocks.BaseBlock;
|
||||||
|
import com.sk89q.worldedit.function.mask.MaskIntersection;
|
||||||
|
import com.sk89q.worldedit.function.mask.Masks;
|
||||||
|
import com.sk89q.worldedit.function.mask.OffsetMask;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* @deprecated Use {@link OffsetMask} with {@link MaskIntersection} and {@link Masks#negate(com.sk89q.worldedit.function.mask.Mask)}
|
||||||
* @author 1337
|
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public class UnderOverlayMask extends AbstractMask {
|
public class UnderOverlayMask extends AbstractMask {
|
||||||
private final int yMod;
|
private final int yMod;
|
||||||
private Mask mask;
|
private Mask mask;
|
||||||
|
|||||||
@ -250,7 +250,7 @@ public class EditSession implements Extent {
|
|||||||
if (mask == null) {
|
if (mask == null) {
|
||||||
maskingExtent.setMask(Masks.alwaysTrue());
|
maskingExtent.setMask(Masks.alwaysTrue());
|
||||||
} else {
|
} else {
|
||||||
maskingExtent.setMask(Masks.wrap(this, mask));
|
maskingExtent.setMask(Masks.wrap(mask, this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -570,6 +570,16 @@ public class EditSession implements Extent {
|
|||||||
return getBlockChangeCount();
|
return getBlockChangeCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMinimumPoint() {
|
||||||
|
return getWorld().getMinimumPoint();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMaximumPoint() {
|
||||||
|
return getWorld().getMaximumPoint();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Finish off the queue.
|
* Finish off the queue.
|
||||||
*/
|
*/
|
||||||
@ -818,7 +828,7 @@ public class EditSession implements Extent {
|
|||||||
checkNotNull(pattern);
|
checkNotNull(pattern);
|
||||||
|
|
||||||
BlockReplace replace = new BlockReplace(this, Patterns.wrap(pattern));
|
BlockReplace replace = new BlockReplace(this, Patterns.wrap(pattern));
|
||||||
RegionMaskingFilter filter = new RegionMaskingFilter(Masks.wrap(this, mask), replace);
|
RegionMaskingFilter filter = new RegionMaskingFilter(Masks.wrap(mask, this), replace);
|
||||||
RegionVisitor visitor = new RegionVisitor(region, filter);
|
RegionVisitor visitor = new RegionVisitor(region, filter);
|
||||||
Operations.completeLegacy(visitor);
|
Operations.completeLegacy(visitor);
|
||||||
return visitor.getAffected();
|
return visitor.getAffected();
|
||||||
|
|||||||
@ -19,28 +19,26 @@
|
|||||||
|
|
||||||
package com.sk89q.worldedit;
|
package com.sk89q.worldedit;
|
||||||
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.TimeZone;
|
|
||||||
import com.sk89q.jchronic.Chronic;
|
import com.sk89q.jchronic.Chronic;
|
||||||
import com.sk89q.jchronic.Options;
|
import com.sk89q.jchronic.Options;
|
||||||
import com.sk89q.jchronic.utils.Span;
|
import com.sk89q.jchronic.utils.Span;
|
||||||
import com.sk89q.jchronic.utils.Time;
|
import com.sk89q.jchronic.utils.Time;
|
||||||
import com.sk89q.worldedit.world.snapshot.Snapshot;
|
import com.sk89q.worldedit.command.tool.BlockTool;
|
||||||
import com.sk89q.worldedit.command.tool.BrushTool;
|
import com.sk89q.worldedit.command.tool.BrushTool;
|
||||||
import com.sk89q.worldedit.command.tool.SinglePickaxe;
|
import com.sk89q.worldedit.command.tool.SinglePickaxe;
|
||||||
import com.sk89q.worldedit.command.tool.BlockTool;
|
|
||||||
import com.sk89q.worldedit.command.tool.Tool;
|
import com.sk89q.worldedit.command.tool.Tool;
|
||||||
import com.sk89q.worldedit.extent.inventory.BlockBag;
|
import com.sk89q.worldedit.extent.inventory.BlockBag;
|
||||||
import com.sk89q.worldedit.internal.cui.CUIRegion;
|
|
||||||
import com.sk89q.worldedit.internal.cui.CUIEvent;
|
import com.sk89q.worldedit.internal.cui.CUIEvent;
|
||||||
|
import com.sk89q.worldedit.internal.cui.CUIRegion;
|
||||||
import com.sk89q.worldedit.internal.cui.SelectionShapeEvent;
|
import com.sk89q.worldedit.internal.cui.SelectionShapeEvent;
|
||||||
import com.sk89q.worldedit.masks.Mask;
|
import com.sk89q.worldedit.masks.Mask;
|
||||||
import com.sk89q.worldedit.regions.CuboidRegionSelector;
|
import com.sk89q.worldedit.regions.CuboidRegionSelector;
|
||||||
import com.sk89q.worldedit.regions.Region;
|
import com.sk89q.worldedit.regions.Region;
|
||||||
import com.sk89q.worldedit.regions.RegionSelector;
|
import com.sk89q.worldedit.regions.RegionSelector;
|
||||||
|
import com.sk89q.worldedit.session.request.Request;
|
||||||
|
import com.sk89q.worldedit.world.snapshot.Snapshot;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An instance of this represents the WorldEdit session of a user. A session
|
* An instance of this represents the WorldEdit session of a user. A session
|
||||||
@ -704,6 +702,7 @@ public class LocalSession {
|
|||||||
.getEditSession(player.isPlayer() ? player.getWorld() : null,
|
.getEditSession(player.isPlayer() ? player.getWorld() : null,
|
||||||
getBlockChangeLimit(), blockBag, player);
|
getBlockChangeLimit(), blockBag, player);
|
||||||
editSession.setFastMode(fastMode);
|
editSession.setFastMode(fastMode);
|
||||||
|
Request.request().setEditSession(editSession);
|
||||||
if (mask != null) {
|
if (mask != null) {
|
||||||
mask.prepare(this, player, null);
|
mask.prepare(this, player, null);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -626,9 +626,18 @@ public abstract class LocalWorld implements World, Extent {
|
|||||||
new BaseBlock(BlockID.WATER, -1));
|
new BaseBlock(BlockID.WATER, -1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMaximumPoint() {
|
||||||
|
return new Vector(30000000, 30000000, 30000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMinimumPoint() {
|
||||||
|
return new Vector(-30000000, -30000000, -30000000);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @Nullable Operation commit() {
|
public @Nullable Operation commit() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,17 +23,26 @@ import com.sk89q.minecraft.util.commands.*;
|
|||||||
import com.sk89q.minecraft.util.commands.Console;
|
import com.sk89q.minecraft.util.commands.Console;
|
||||||
import com.sk89q.util.StringUtil;
|
import com.sk89q.util.StringUtil;
|
||||||
import com.sk89q.worldedit.CuboidClipboard.FlipDirection;
|
import com.sk89q.worldedit.CuboidClipboard.FlipDirection;
|
||||||
import com.sk89q.worldedit.extent.inventory.BlockBag;
|
import com.sk89q.worldedit.blocks.BaseBlock;
|
||||||
import com.sk89q.worldedit.blocks.*;
|
import com.sk89q.worldedit.blocks.BlockType;
|
||||||
|
import com.sk89q.worldedit.blocks.ItemType;
|
||||||
import com.sk89q.worldedit.command.*;
|
import com.sk89q.worldedit.command.*;
|
||||||
|
import com.sk89q.worldedit.command.tool.*;
|
||||||
import com.sk89q.worldedit.event.extent.EditSessionEvent;
|
import com.sk89q.worldedit.event.extent.EditSessionEvent;
|
||||||
import com.sk89q.worldedit.masks.*;
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
import com.sk89q.worldedit.patterns.*;
|
import com.sk89q.worldedit.extension.registry.BlockRegistry;
|
||||||
|
import com.sk89q.worldedit.extension.registry.MaskRegistry;
|
||||||
|
import com.sk89q.worldedit.extension.registry.PatternRegistry;
|
||||||
|
import com.sk89q.worldedit.extent.inventory.BlockBag;
|
||||||
|
import com.sk89q.worldedit.function.mask.Masks;
|
||||||
|
import com.sk89q.worldedit.function.pattern.Patterns;
|
||||||
|
import com.sk89q.worldedit.masks.Mask;
|
||||||
|
import com.sk89q.worldedit.patterns.Pattern;
|
||||||
import com.sk89q.worldedit.regions.RegionSelector;
|
import com.sk89q.worldedit.regions.RegionSelector;
|
||||||
import com.sk89q.worldedit.scripting.CraftScriptContext;
|
import com.sk89q.worldedit.scripting.CraftScriptContext;
|
||||||
import com.sk89q.worldedit.scripting.CraftScriptEngine;
|
import com.sk89q.worldedit.scripting.CraftScriptEngine;
|
||||||
import com.sk89q.worldedit.scripting.RhinoCraftScriptEngine;
|
import com.sk89q.worldedit.scripting.RhinoCraftScriptEngine;
|
||||||
import com.sk89q.worldedit.command.tool.*;
|
import com.sk89q.worldedit.session.request.Request;
|
||||||
import com.sk89q.worldedit.util.LogFormat;
|
import com.sk89q.worldedit.util.LogFormat;
|
||||||
import com.sk89q.worldedit.util.eventbus.EventBus;
|
import com.sk89q.worldedit.util.eventbus.EventBus;
|
||||||
|
|
||||||
@ -66,6 +75,10 @@ public class WorldEdit {
|
|||||||
private final EditSessionFactory editSessionFactory = new EditSessionFactory(eventBus);
|
private final EditSessionFactory editSessionFactory = new EditSessionFactory(eventBus);
|
||||||
private final HashMap<String, LocalSession> sessions = new HashMap<String, LocalSession>();
|
private final HashMap<String, LocalSession> sessions = new HashMap<String, LocalSession>();
|
||||||
|
|
||||||
|
private final BlockRegistry blockRegistry = new BlockRegistry(this);
|
||||||
|
private final MaskRegistry maskRegistry = new MaskRegistry(this);
|
||||||
|
private final PatternRegistry patternRegistry = new PatternRegistry(this);
|
||||||
|
|
||||||
static {
|
static {
|
||||||
getVersion();
|
getVersion();
|
||||||
}
|
}
|
||||||
@ -207,6 +220,36 @@ public class WorldEdit {
|
|||||||
return eventBus;
|
return eventBus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the block registry from which new {@link BaseBlock}s can be
|
||||||
|
* constructed.
|
||||||
|
*
|
||||||
|
* @return the block registry
|
||||||
|
*/
|
||||||
|
public BlockRegistry getBlockRegistry() {
|
||||||
|
return blockRegistry;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the mask registry from which new {@link com.sk89q.worldedit.function.mask.Mask}s
|
||||||
|
* can be constructed.
|
||||||
|
*
|
||||||
|
* @return the mask registry
|
||||||
|
*/
|
||||||
|
public MaskRegistry getMaskRegistry() {
|
||||||
|
return maskRegistry;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the pattern registry from which new {@link com.sk89q.worldedit.function.pattern.Pattern}s
|
||||||
|
* can be constructed.
|
||||||
|
*
|
||||||
|
* @return the pattern registry
|
||||||
|
*/
|
||||||
|
public PatternRegistry getPatternRegistry() {
|
||||||
|
return patternRegistry;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the LocalSession for a player name if it exists
|
* Gets the LocalSession for a player name if it exists
|
||||||
*
|
*
|
||||||
@ -283,289 +326,42 @@ public class WorldEdit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public BaseBlock getBlock(LocalPlayer player, String arg, boolean allAllowed)
|
/**
|
||||||
throws WorldEditException {
|
* @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public BaseBlock getBlock(LocalPlayer player, String arg, boolean allAllowed) throws WorldEditException {
|
||||||
return getBlock(player, arg, allAllowed, false);
|
return getBlock(player, arg, allAllowed, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get an item ID from an item name or an item ID number.
|
* @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
|
||||||
*
|
|
||||||
* @param player
|
|
||||||
* @param arg
|
|
||||||
* @param allAllowed true to ignore blacklists
|
|
||||||
* @param allowNoData return -1 for data if no data was given.
|
|
||||||
* @return
|
|
||||||
* @throws UnknownItemException
|
|
||||||
* @throws DisallowedItemException
|
|
||||||
*/
|
*/
|
||||||
public BaseBlock getBlock(LocalPlayer player, String arg,
|
@Deprecated
|
||||||
boolean allAllowed, boolean allowNoData)
|
public BaseBlock getBlock(LocalPlayer player, String arg, boolean allAllowed, boolean allowNoData) throws WorldEditException {
|
||||||
throws WorldEditException {
|
ParserContext context = new ParserContext();
|
||||||
BlockType blockType;
|
context.setPlayer(player);
|
||||||
arg = arg.replace("_", " ");
|
context.setWorld(player.getWorld());
|
||||||
arg = arg.replace(";", "|");
|
context.setSession(getSession(player));
|
||||||
String[] blockAndExtraData = arg.split("\\|");
|
context.setRestricted(!allAllowed);
|
||||||
String[] typeAndData = blockAndExtraData[0].split(":", 2);
|
context.setPreferringWildcard(allowNoData);
|
||||||
String testID = typeAndData[0];
|
return getBlockRegistry().parseFromInput(arg, context);
|
||||||
|
|
||||||
int blockId = -1;
|
|
||||||
|
|
||||||
int data = -1;
|
|
||||||
|
|
||||||
boolean parseDataValue = true;
|
|
||||||
if ("hand".equalsIgnoreCase(testID)) {
|
|
||||||
// Get the block type from the item in the user's hand.
|
|
||||||
final BaseBlock blockInHand = player.getBlockInHand();
|
|
||||||
if (blockInHand.getClass() != BaseBlock.class) {
|
|
||||||
return blockInHand;
|
|
||||||
}
|
|
||||||
|
|
||||||
blockId = blockInHand.getId();
|
|
||||||
blockType = BlockType.fromID(blockId);
|
|
||||||
data = blockInHand.getData();
|
|
||||||
} else if ("pos1".equalsIgnoreCase(testID)) {
|
|
||||||
// Get the block type from the "primary position"
|
|
||||||
final LocalWorld world = player.getWorld();
|
|
||||||
final BlockVector primaryPosition = getSession(player).getRegionSelector(world).getPrimaryPosition();
|
|
||||||
final BaseBlock blockInHand = world.getBlock(primaryPosition);
|
|
||||||
if (blockInHand.getClass() != BaseBlock.class) {
|
|
||||||
return blockInHand;
|
|
||||||
}
|
|
||||||
|
|
||||||
blockId = blockInHand.getId();
|
|
||||||
blockType = BlockType.fromID(blockId);
|
|
||||||
data = blockInHand.getData();
|
|
||||||
} else {
|
|
||||||
// Attempt to parse the item ID or otherwise resolve an item/block
|
|
||||||
// name to its numeric ID
|
|
||||||
try {
|
|
||||||
blockId = Integer.parseInt(testID);
|
|
||||||
blockType = BlockType.fromID(blockId);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
blockType = BlockType.lookup(testID);
|
|
||||||
if (blockType == null) {
|
|
||||||
int t = server.resolveItem(testID);
|
|
||||||
if (t > 0) {
|
|
||||||
blockType = BlockType.fromID(t); // Could be null
|
|
||||||
blockId = t;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (blockId == -1 && blockType == null) {
|
|
||||||
// Maybe it's a cloth
|
|
||||||
ClothColor col = ClothColor.lookup(testID);
|
|
||||||
if (col == null) {
|
|
||||||
throw new UnknownItemException(arg);
|
|
||||||
}
|
|
||||||
|
|
||||||
blockType = BlockType.CLOTH;
|
|
||||||
data = col.getID();
|
|
||||||
|
|
||||||
// Prevent overriding the data value
|
|
||||||
parseDataValue = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read block ID
|
|
||||||
if (blockId == -1) {
|
|
||||||
blockId = blockType.getID();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!player.getWorld().isValidBlockType(blockId)) {
|
|
||||||
throw new UnknownItemException(arg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!allowNoData && data == -1) {
|
|
||||||
// No wildcards allowed => eliminate them.
|
|
||||||
data = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (parseDataValue) { // Block data not yet detected
|
|
||||||
// Parse the block data (optional)
|
|
||||||
try {
|
|
||||||
if (typeAndData.length > 1 && typeAndData[1].length() > 0) {
|
|
||||||
data = Integer.parseInt(typeAndData[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data > 15) {
|
|
||||||
throw new InvalidItemException(arg, "Invalid data value '" + typeAndData[1] + "'");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data < 0 && !(allAllowed && data == -1)) {
|
|
||||||
data = 0;
|
|
||||||
}
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
if (blockType == null) {
|
|
||||||
throw new InvalidItemException(arg, "Unknown data value '" + typeAndData[1] + "'");
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (blockType) {
|
|
||||||
case CLOTH:
|
|
||||||
case STAINED_CLAY:
|
|
||||||
case CARPET:
|
|
||||||
ClothColor col = ClothColor.lookup(typeAndData[1]);
|
|
||||||
if (col == null) {
|
|
||||||
throw new InvalidItemException(arg, "Unknown cloth color '" + typeAndData[1] + "'");
|
|
||||||
}
|
|
||||||
|
|
||||||
data = col.getID();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case STEP:
|
|
||||||
case DOUBLE_STEP:
|
|
||||||
BlockType dataType = BlockType.lookup(typeAndData[1]);
|
|
||||||
|
|
||||||
if (dataType == null) {
|
|
||||||
throw new InvalidItemException(arg, "Unknown step type '" + typeAndData[1] + "'");
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (dataType) {
|
|
||||||
case STONE:
|
|
||||||
data = 0;
|
|
||||||
break;
|
|
||||||
case SANDSTONE:
|
|
||||||
data = 1;
|
|
||||||
break;
|
|
||||||
case WOOD:
|
|
||||||
data = 2;
|
|
||||||
break;
|
|
||||||
case COBBLESTONE:
|
|
||||||
data = 3;
|
|
||||||
break;
|
|
||||||
case BRICK:
|
|
||||||
data = 4;
|
|
||||||
break;
|
|
||||||
case STONE_BRICK:
|
|
||||||
data = 5;
|
|
||||||
break;
|
|
||||||
case NETHER_BRICK:
|
|
||||||
data = 6;
|
|
||||||
break;
|
|
||||||
case QUARTZ_BLOCK:
|
|
||||||
data = 7;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
throw new InvalidItemException(arg, "Invalid step type '" + typeAndData[1] + "'");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
throw new InvalidItemException(arg, "Unknown data value '" + typeAndData[1] + "'");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if the item is allowed
|
|
||||||
if (!allAllowed && !player.hasPermission("worldedit.anyblock") && config.disallowedBlocks.contains(blockId)) {
|
|
||||||
throw new DisallowedItemException(arg);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (blockType == null) {
|
|
||||||
return new BaseBlock(blockId, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (blockType) {
|
|
||||||
case SIGN_POST:
|
|
||||||
case WALL_SIGN:
|
|
||||||
// Allow special sign text syntax
|
|
||||||
String[] text = new String[4];
|
|
||||||
text[0] = blockAndExtraData.length > 1 ? blockAndExtraData[1] : "";
|
|
||||||
text[1] = blockAndExtraData.length > 2 ? blockAndExtraData[2] : "";
|
|
||||||
text[2] = blockAndExtraData.length > 3 ? blockAndExtraData[3] : "";
|
|
||||||
text[3] = blockAndExtraData.length > 4 ? blockAndExtraData[4] : "";
|
|
||||||
return new SignBlock(blockType.getID(), data, text);
|
|
||||||
|
|
||||||
case MOB_SPAWNER:
|
|
||||||
// Allow setting mob spawn type
|
|
||||||
if (blockAndExtraData.length > 1) {
|
|
||||||
String mobName = blockAndExtraData[1];
|
|
||||||
for (MobType mobType : MobType.values()) {
|
|
||||||
if (mobType.getName().toLowerCase().equals(mobName.toLowerCase())) {
|
|
||||||
mobName = mobType.getName();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!server.isValidMobType(mobName)) {
|
|
||||||
throw new InvalidItemException(arg, "Unknown mob type '" + mobName + "'");
|
|
||||||
}
|
|
||||||
return new MobSpawnerBlock(data, mobName);
|
|
||||||
} else {
|
|
||||||
return new MobSpawnerBlock(data, MobType.PIG.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
case NOTE_BLOCK:
|
|
||||||
// Allow setting note
|
|
||||||
if (blockAndExtraData.length <= 1) {
|
|
||||||
return new NoteBlock(data, (byte) 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
byte note = Byte.parseByte(blockAndExtraData[1]);
|
|
||||||
if (note < 0 || note > 24) {
|
|
||||||
throw new InvalidItemException(arg, "Out of range note value: '" + blockAndExtraData[1] + "'");
|
|
||||||
}
|
|
||||||
|
|
||||||
return new NoteBlock(data, note);
|
|
||||||
|
|
||||||
case HEAD:
|
|
||||||
// allow setting type/player/rotation
|
|
||||||
if (blockAndExtraData.length <= 1) {
|
|
||||||
return new SkullBlock(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
byte rot = 0;
|
|
||||||
String type = "";
|
|
||||||
try {
|
|
||||||
rot = Byte.parseByte(blockAndExtraData[1]);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
type = blockAndExtraData[1];
|
|
||||||
if (blockAndExtraData.length > 2) {
|
|
||||||
try {
|
|
||||||
rot = Byte.parseByte(blockAndExtraData[2]);
|
|
||||||
} catch (NumberFormatException e2) {
|
|
||||||
throw new InvalidItemException(arg, "Second part of skull metadata should be a number.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
byte skullType = 0;
|
|
||||||
// type is either the mob type or the player name
|
|
||||||
// sorry for the four minecraft accounts named "skeleton", "wither", "zombie", or "creeper"
|
|
||||||
if (!type.isEmpty()) {
|
|
||||||
if (type.equalsIgnoreCase("skeleton")) skullType = 0;
|
|
||||||
else if (type.equalsIgnoreCase("wither")) skullType = 1;
|
|
||||||
else if (type.equalsIgnoreCase("zombie")) skullType = 2;
|
|
||||||
else if (type.equalsIgnoreCase("creeper")) skullType = 4;
|
|
||||||
else skullType = 3;
|
|
||||||
}
|
|
||||||
if (skullType == 3) {
|
|
||||||
return new SkullBlock(data, rot, type.replace(" ", "_")); // valid MC usernames
|
|
||||||
} else {
|
|
||||||
return new SkullBlock(data, skullType, rot);
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
return new BaseBlock(blockId, data);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a block.
|
* @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
|
||||||
*
|
|
||||||
* @param player
|
|
||||||
* @param id
|
|
||||||
* @return
|
|
||||||
* @throws UnknownItemException
|
|
||||||
* @throws DisallowedItemException
|
|
||||||
*/
|
*/
|
||||||
public BaseBlock getBlock(LocalPlayer player, String id)
|
@Deprecated
|
||||||
throws WorldEditException {
|
public BaseBlock getBlock(LocalPlayer player, String id) throws WorldEditException {
|
||||||
return getBlock(player, id, false);
|
return getBlock(player, id, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Set<BaseBlock> getBlocks(LocalPlayer player, String list, boolean allAllowed, boolean allowNoData)
|
/**
|
||||||
throws WorldEditException {
|
* @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromListInput(String, ParserContext)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public Set<BaseBlock> getBlocks(LocalPlayer player, String list, boolean allAllowed, boolean allowNoData) throws WorldEditException {
|
||||||
String[] items = list.split(",");
|
String[] items = list.split(",");
|
||||||
Set<BaseBlock> blocks = new HashSet<BaseBlock>();
|
Set<BaseBlock> blocks = new HashSet<BaseBlock>();
|
||||||
for (String id : items) {
|
for (String id : items) {
|
||||||
@ -574,182 +370,30 @@ public class WorldEdit {
|
|||||||
return blocks;
|
return blocks;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Set<BaseBlock> getBlocks(LocalPlayer player, String list, boolean allAllowed)
|
/**
|
||||||
throws WorldEditException {
|
* @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public Set<BaseBlock> getBlocks(LocalPlayer player, String list, boolean allAllowed) throws WorldEditException {
|
||||||
return getBlocks(player, list, allAllowed, false);
|
return getBlocks(player, list, allAllowed, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Set<BaseBlock> getBlocks(LocalPlayer player, String list)
|
/**
|
||||||
throws WorldEditException {
|
* @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromListInput(String, ParserContext)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public Set<BaseBlock> getBlocks(LocalPlayer player, String list) throws WorldEditException {
|
||||||
return getBlocks(player, list, false);
|
return getBlocks(player, list, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a Pattern corresponding to the specified pattern string,
|
* @deprecated Use {@link #getBlockRegistry()} and {@link BlockRegistry#parseFromListInput(String, ParserContext)}
|
||||||
* as given by the player on the command line.
|
|
||||||
*
|
|
||||||
* @param player
|
|
||||||
* @param patternString
|
|
||||||
* @return pattern
|
|
||||||
* @throws UnknownItemException
|
|
||||||
* @throws DisallowedItemException
|
|
||||||
*/
|
*/
|
||||||
public Pattern getBlockPattern(LocalPlayer player, String patternString)
|
@Deprecated
|
||||||
throws WorldEditException {
|
@SuppressWarnings("deprecation")
|
||||||
|
public Set<Integer> getBlockIDs(LocalPlayer player, String list, boolean allBlocksAllowed) throws WorldEditException {
|
||||||
String[] items = patternString.split(",");
|
|
||||||
|
|
||||||
// Handle special block pattern types
|
|
||||||
if (patternString.charAt(0) == '#') {
|
|
||||||
if (!patternString.equals("#clipboard") && !patternString.equals("#copy")) {
|
|
||||||
throw new UnknownItemException(patternString);
|
|
||||||
}
|
|
||||||
|
|
||||||
LocalSession session = getSession(player);
|
|
||||||
|
|
||||||
try {
|
|
||||||
return new ClipboardPattern(session.getClipboard());
|
|
||||||
} catch (EmptyClipboardException e) {
|
|
||||||
player.printError("Copy a selection first with //copy.");
|
|
||||||
throw new UnknownItemException("#clipboard");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If it's only one block, then just return that single one
|
|
||||||
if (items.length == 1) {
|
|
||||||
return new SingleBlockPattern(getBlock(player, items[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
List<BlockChance> blockChances = new ArrayList<BlockChance>();
|
|
||||||
|
|
||||||
for (String s : items) {
|
|
||||||
BaseBlock block;
|
|
||||||
|
|
||||||
double chance;
|
|
||||||
|
|
||||||
// Parse special percentage syntax
|
|
||||||
if (s.matches("[0-9]+(\\.[0-9]*)?%.*")) {
|
|
||||||
String[] p = s.split("%");
|
|
||||||
if (p.length < 2) {
|
|
||||||
throw new UnknownItemException(s);
|
|
||||||
} else {
|
|
||||||
chance = Double.parseDouble(p[0]);
|
|
||||||
block = getBlock(player, p[1]);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
chance = 1;
|
|
||||||
block = getBlock(player, s);
|
|
||||||
}
|
|
||||||
|
|
||||||
blockChances.add(new BlockChance(block, chance));
|
|
||||||
}
|
|
||||||
|
|
||||||
return new RandomFillPattern(blockChances);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a block mask. Block masks are used to determine which
|
|
||||||
* blocks to include when replacing.
|
|
||||||
*
|
|
||||||
* @param player
|
|
||||||
* @param session
|
|
||||||
* @param maskString
|
|
||||||
* @return
|
|
||||||
* @throws WorldEditException
|
|
||||||
*/
|
|
||||||
public Mask getBlockMask(LocalPlayer player, LocalSession session,
|
|
||||||
String maskString) throws WorldEditException {
|
|
||||||
List<Mask> masks = new ArrayList<Mask>();
|
|
||||||
|
|
||||||
for (String component : maskString.split(" ")) {
|
|
||||||
if (component.length() == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
Mask current = getBlockMaskComponent(player, session, masks, component);
|
|
||||||
|
|
||||||
masks.add(current);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (masks.size()) {
|
|
||||||
case 0:
|
|
||||||
return null;
|
|
||||||
|
|
||||||
case 1:
|
|
||||||
return masks.get(0);
|
|
||||||
|
|
||||||
default:
|
|
||||||
return new CombinedMask(masks);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private Mask getBlockMaskComponent(LocalPlayer player, LocalSession session, List<Mask> masks, String component) throws WorldEditException {
|
|
||||||
final char firstChar = component.charAt(0);
|
|
||||||
switch (firstChar) {
|
|
||||||
case '#':
|
|
||||||
if (component.equalsIgnoreCase("#existing")) {
|
|
||||||
return new ExistingBlockMask();
|
|
||||||
} else if (component.equalsIgnoreCase("#solid")) {
|
|
||||||
return new SolidBlockMask();
|
|
||||||
} else if (component.equalsIgnoreCase("#dregion")
|
|
||||||
|| component.equalsIgnoreCase("#dselection")
|
|
||||||
|| component.equalsIgnoreCase("#dsel")) {
|
|
||||||
return new DynamicRegionMask();
|
|
||||||
} else if (component.equalsIgnoreCase("#selection")
|
|
||||||
|| component.equalsIgnoreCase("#region")
|
|
||||||
|| component.equalsIgnoreCase("#sel")) {
|
|
||||||
return new RegionMask(session.getSelection(player.getWorld()));
|
|
||||||
} else {
|
|
||||||
throw new UnknownItemException(component);
|
|
||||||
}
|
|
||||||
|
|
||||||
case '>':
|
|
||||||
case '<':
|
|
||||||
Mask submask;
|
|
||||||
if (component.length() > 1) {
|
|
||||||
submask = getBlockMaskComponent(player, session, masks, component.substring(1));
|
|
||||||
} else {
|
|
||||||
submask = new ExistingBlockMask();
|
|
||||||
}
|
|
||||||
return new UnderOverlayMask(submask, firstChar == '>');
|
|
||||||
|
|
||||||
case '$':
|
|
||||||
Set<BiomeType> biomes = new HashSet<BiomeType>();
|
|
||||||
String[] biomesList = component.substring(1).split(",");
|
|
||||||
for (String biomeName : biomesList) {
|
|
||||||
BiomeType biome = server.getBiomes().get(biomeName);
|
|
||||||
biomes.add(biome);
|
|
||||||
}
|
|
||||||
return new BiomeTypeMask(biomes);
|
|
||||||
|
|
||||||
case '%':
|
|
||||||
int i = Integer.parseInt(component.substring(1));
|
|
||||||
return new RandomMask(((double) i) / 100);
|
|
||||||
|
|
||||||
case '!':
|
|
||||||
if (component.length() > 1) {
|
|
||||||
return new InvertedMask(getBlockMaskComponent(player, session, masks, component.substring(1)));
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
return new BlockMask(getBlocks(player, component, true, true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a list of blocks as a set.
|
|
||||||
*
|
|
||||||
* @param player
|
|
||||||
* @param list
|
|
||||||
* @param allBlocksAllowed
|
|
||||||
* @return set
|
|
||||||
* @throws UnknownItemException
|
|
||||||
* @throws DisallowedItemException
|
|
||||||
*/
|
|
||||||
public Set<Integer> getBlockIDs(LocalPlayer player,
|
|
||||||
String list, boolean allBlocksAllowed)
|
|
||||||
throws WorldEditException {
|
|
||||||
|
|
||||||
String[] items = list.split(",");
|
String[] items = list.split(",");
|
||||||
Set<Integer> blocks = new HashSet<Integer>();
|
Set<Integer> blocks = new HashSet<Integer>();
|
||||||
for (String s : items) {
|
for (String s : items) {
|
||||||
@ -758,6 +402,32 @@ public class WorldEdit {
|
|||||||
return blocks;
|
return blocks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use {@link #getPatternRegistry()} and {@link BlockRegistry#parseFromInput(String, ParserContext)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public Pattern getBlockPattern(LocalPlayer player, String input) throws WorldEditException {
|
||||||
|
ParserContext context = new ParserContext();
|
||||||
|
context.setPlayer(player);
|
||||||
|
context.setWorld(player.getWorld());
|
||||||
|
context.setSession(getSession(player));
|
||||||
|
return Patterns.wrap(getPatternRegistry().parseFromInput(input, context));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use {@link #getMaskRegistry()} ()} and {@link MaskRegistry#parseFromInput(String, ParserContext)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public Mask getBlockMask(LocalPlayer player, LocalSession session, String input) throws WorldEditException {
|
||||||
|
ParserContext context = new ParserContext();
|
||||||
|
context.setPlayer(player);
|
||||||
|
context.setWorld(player.getWorld());
|
||||||
|
context.setSession(session);
|
||||||
|
return Masks.wrap(getMaskRegistry().parseFromInput(input, context));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the path to a file. This method will check to see if the filename
|
* Gets the path to a file. This method will check to see if the filename
|
||||||
* has valid characters and has an extension. It also prevents directory
|
* has valid characters and has an extension. It also prevents directory
|
||||||
@ -1361,6 +1031,8 @@ public class WorldEdit {
|
|||||||
* @return whether the command was processed
|
* @return whether the command was processed
|
||||||
*/
|
*/
|
||||||
public boolean handleCommand(LocalPlayer player, String[] split) {
|
public boolean handleCommand(LocalPlayer player, String[] split) {
|
||||||
|
Request.reset();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
split = commandDetection(split);
|
split = commandDetection(split);
|
||||||
|
|
||||||
@ -1464,6 +1136,8 @@ public class WorldEdit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String[] commandDetection(String[] split) {
|
public String[] commandDetection(String[] split) {
|
||||||
|
Request.reset();
|
||||||
|
|
||||||
split[0] = split[0].substring(1);
|
split[0] = split[0].substring(1);
|
||||||
|
|
||||||
// Quick script shortcut
|
// Quick script shortcut
|
||||||
@ -1496,8 +1170,9 @@ public class WorldEdit {
|
|||||||
* @param args
|
* @param args
|
||||||
* @throws WorldEditException
|
* @throws WorldEditException
|
||||||
*/
|
*/
|
||||||
public void runScript(LocalPlayer player, File f, String[] args)
|
public void runScript(LocalPlayer player, File f, String[] args) throws WorldEditException {
|
||||||
throws WorldEditException {
|
Request.reset();
|
||||||
|
|
||||||
String filename = f.getPath();
|
String filename = f.getPath();
|
||||||
int index = filename.lastIndexOf(".");
|
int index = filename.lastIndexOf(".");
|
||||||
String ext = filename.substring(index + 1, filename.length());
|
String ext = filename.substring(index + 1, filename.length());
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
// $Id$
|
|
||||||
/*
|
/*
|
||||||
* WorldEdit
|
* WorldEdit, a Minecraft world manipulation toolkit
|
||||||
* Copyright (C) 2010 sk89q <http://www.sk89q.com> and contributors
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -15,21 +15,46 @@
|
|||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.sk89q.worldedit;
|
package com.sk89q.worldedit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Parent for all WorldEdit exceptions.
|
||||||
* @author sk89q
|
|
||||||
*/
|
*/
|
||||||
public abstract class WorldEditException extends Exception {
|
public abstract class WorldEditException extends Exception {
|
||||||
private static final long serialVersionUID = 3201997990797993987L;
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new exception.
|
||||||
|
*/
|
||||||
protected WorldEditException() {
|
protected WorldEditException() {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected WorldEditException(String msg) {
|
/**
|
||||||
super(msg);
|
* Create a new exception with a message.
|
||||||
|
*
|
||||||
|
* @param message the message
|
||||||
|
*/
|
||||||
|
protected WorldEditException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new exception with a message and a cause.
|
||||||
|
*
|
||||||
|
* @param message the message
|
||||||
|
* @param cause the cause
|
||||||
|
*/
|
||||||
|
protected WorldEditException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new exception with a cause.
|
||||||
|
*
|
||||||
|
* @param cause the cause
|
||||||
|
*/
|
||||||
|
protected WorldEditException(Throwable cause) {
|
||||||
|
super(cause);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -29,6 +29,7 @@ import com.sk89q.worldedit.patterns.Pattern;
|
|||||||
import com.sk89q.worldedit.patterns.SingleBlockPattern;
|
import com.sk89q.worldedit.patterns.SingleBlockPattern;
|
||||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
import com.sk89q.worldedit.command.tool.brush.Brush;
|
||||||
import com.sk89q.worldedit.command.tool.brush.SphereBrush;
|
import com.sk89q.worldedit.command.tool.brush.SphereBrush;
|
||||||
|
import com.sk89q.worldedit.session.request.Request;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builds a shape at the place being looked at.
|
* Builds a shape at the place being looked at.
|
||||||
@ -177,6 +178,7 @@ public class BrushTool implements TraceTool {
|
|||||||
BlockBag bag = session.getBlockBag(player);
|
BlockBag bag = session.getBlockBag(player);
|
||||||
|
|
||||||
EditSession editSession = session.createEditSession(player);
|
EditSession editSession = session.createEditSession(player);
|
||||||
|
Request.request().setEditSession(editSession);
|
||||||
if (mask != null) {
|
if (mask != null) {
|
||||||
mask.prepare(session, player, target);
|
mask.prepare(session, player, target);
|
||||||
Mask existingMask = editSession.getMask();
|
Mask existingMask = editSession.getMask();
|
||||||
|
|||||||
@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.input;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Thrown when usage is disallowed.
|
||||||
|
*/
|
||||||
|
public class DisallowedUsageException extends InputParseException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create with a message.
|
||||||
|
*
|
||||||
|
* @param message the message
|
||||||
|
*/
|
||||||
|
public DisallowedUsageException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create with a message and a cause.
|
||||||
|
*
|
||||||
|
* @param message the message
|
||||||
|
* @param cause the cause
|
||||||
|
*/
|
||||||
|
public DisallowedUsageException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.input;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.WorldEditException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Thrown when parsed input results in an error.
|
||||||
|
*/
|
||||||
|
public class InputParseException extends WorldEditException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Throw with a message.
|
||||||
|
*
|
||||||
|
* @param message the message
|
||||||
|
*/
|
||||||
|
public InputParseException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Throw with a message and a cause.
|
||||||
|
*
|
||||||
|
* @param message the message
|
||||||
|
* @param cause the cause
|
||||||
|
*/
|
||||||
|
public InputParseException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.input;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Thrown when a match fails when input is parsed.
|
||||||
|
*/
|
||||||
|
public class NoMatchException extends InputParseException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create with a message.
|
||||||
|
*
|
||||||
|
* @param message the message
|
||||||
|
*/
|
||||||
|
public NoMatchException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create with a message and a cause.
|
||||||
|
*
|
||||||
|
* @param message the message
|
||||||
|
* @param cause the cause
|
||||||
|
*/
|
||||||
|
public NoMatchException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
211
src/main/java/com/sk89q/worldedit/extension/input/ParserContext.java
Normale Datei
211
src/main/java/com/sk89q/worldedit/extension/input/ParserContext.java
Normale Datei
@ -0,0 +1,211 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.input;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.LocalPlayer;
|
||||||
|
import com.sk89q.worldedit.LocalSession;
|
||||||
|
import com.sk89q.worldedit.LocalWorld;
|
||||||
|
import com.sk89q.worldedit.extension.registry.MaskRegistry;
|
||||||
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Contains contextual information that may be useful when constructing
|
||||||
|
* objects from a registry (such as {@link MaskRegistry}).
|
||||||
|
* </p>
|
||||||
|
* By default, {@link #isRestricted()} will return true.
|
||||||
|
*/
|
||||||
|
public class ParserContext {
|
||||||
|
|
||||||
|
private @Nullable Extent extent;
|
||||||
|
private @Nullable LocalSession session;
|
||||||
|
private @Nullable LocalWorld world;
|
||||||
|
private @Nullable LocalPlayer player;
|
||||||
|
private boolean restricted = true;
|
||||||
|
private boolean preferringWildcard;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link Extent} set on this context.
|
||||||
|
*
|
||||||
|
* @return an extent
|
||||||
|
*/
|
||||||
|
public @Nullable Extent getExtent() {
|
||||||
|
return extent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the extent.
|
||||||
|
*
|
||||||
|
* @param extent an extent, or null if none is available
|
||||||
|
*/
|
||||||
|
public void setExtent(@Nullable Extent extent) {
|
||||||
|
this.extent = extent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link LocalSession}.
|
||||||
|
*
|
||||||
|
* @return a session
|
||||||
|
*/
|
||||||
|
public @Nullable LocalSession getSession() {
|
||||||
|
return session;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the session.
|
||||||
|
*
|
||||||
|
* @param session a session, or null if none is available
|
||||||
|
*/
|
||||||
|
public void setSession(@Nullable LocalSession session) {
|
||||||
|
this.session = session;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link LocalWorld} set on this context.
|
||||||
|
*
|
||||||
|
* @return a world
|
||||||
|
*/
|
||||||
|
public @Nullable LocalWorld getWorld() {
|
||||||
|
return world;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the world.
|
||||||
|
*
|
||||||
|
* @param world a world, or null if none is available
|
||||||
|
*/
|
||||||
|
public void setWorld(@Nullable LocalWorld world) {
|
||||||
|
this.world = world;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link LocalPlayer} set on this context.
|
||||||
|
*
|
||||||
|
* @return a player
|
||||||
|
*/
|
||||||
|
public @Nullable LocalPlayer getPlayer() {
|
||||||
|
return player;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the player.
|
||||||
|
*
|
||||||
|
* @param player a player, or null if none is available
|
||||||
|
*/
|
||||||
|
public void setPlayer(@Nullable LocalPlayer player) {
|
||||||
|
this.player = player;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link Extent} set on this context.
|
||||||
|
*
|
||||||
|
* @return an extent
|
||||||
|
* @throws InputParseException thrown if no {@link Extent} is set
|
||||||
|
*/
|
||||||
|
public Extent requireExtent() throws InputParseException {
|
||||||
|
Extent extent = getExtent();
|
||||||
|
if (extent == null) {
|
||||||
|
throw new InputParseException("No Extent is known");
|
||||||
|
}
|
||||||
|
return extent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link LocalSession}.
|
||||||
|
*
|
||||||
|
* @return a session
|
||||||
|
* @throws InputParseException thrown if no {@link LocalSession} is set
|
||||||
|
*/
|
||||||
|
public LocalSession requireSession() throws InputParseException {
|
||||||
|
LocalSession session = getSession();
|
||||||
|
if (session == null) {
|
||||||
|
throw new InputParseException("No LocalSession is known");
|
||||||
|
}
|
||||||
|
return session;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link LocalWorld} set on this context.
|
||||||
|
*
|
||||||
|
* @return a world
|
||||||
|
* @throws InputParseException thrown if no {@link LocalWorld} is set
|
||||||
|
*/
|
||||||
|
public LocalWorld requireWorld() throws InputParseException {
|
||||||
|
LocalWorld world = getWorld();
|
||||||
|
if (world == null) {
|
||||||
|
throw new InputParseException("No world is known");
|
||||||
|
}
|
||||||
|
return world;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link LocalPlayer} set on this context.
|
||||||
|
*
|
||||||
|
* @return a player
|
||||||
|
* @throws InputParseException thrown if no {@link LocalPlayer} is set
|
||||||
|
*/
|
||||||
|
public LocalPlayer requirePlayer() throws InputParseException {
|
||||||
|
LocalPlayer player = getPlayer();
|
||||||
|
if (player == null) {
|
||||||
|
throw new InputParseException("No player is known");
|
||||||
|
}
|
||||||
|
return player;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether there should be restrictions (as a result of
|
||||||
|
* limits or permissions) considered when parsing the input.
|
||||||
|
*
|
||||||
|
* @return true if restricted
|
||||||
|
*/
|
||||||
|
public boolean isRestricted() {
|
||||||
|
return restricted;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set whether there should be restrictions (as a result of
|
||||||
|
* limits or permissions) considered when parsing the input.
|
||||||
|
*
|
||||||
|
* @param restricted true if restricted
|
||||||
|
*/
|
||||||
|
public void setRestricted(boolean restricted) {
|
||||||
|
this.restricted = restricted;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get whether wildcards are preferred.
|
||||||
|
*
|
||||||
|
* @return true if wildcards are preferred
|
||||||
|
*/
|
||||||
|
public boolean isPreferringWildcard() {
|
||||||
|
return preferringWildcard;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set whether wildcards are preferred.
|
||||||
|
*
|
||||||
|
* @param preferringWildcard true if wildcards are preferred
|
||||||
|
*/
|
||||||
|
public void setPreferringWildcard(boolean preferringWildcard) {
|
||||||
|
this.preferringWildcard = preferringWildcard;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.blocks.BaseBlock;
|
||||||
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
import com.sk89q.worldedit.internal.registry.AbstractRegistry;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A registry of known {@link BaseBlock}s. Provides methods to instantiate
|
||||||
|
* new blocks from input.
|
||||||
|
* </p>
|
||||||
|
* Instances of this class can be taken from
|
||||||
|
* {@link WorldEdit#getBlockRegistry()}.
|
||||||
|
*/
|
||||||
|
public class BlockRegistry extends AbstractRegistry<BaseBlock> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new instance.
|
||||||
|
*
|
||||||
|
* @param worldEdit the WorldEdit instance.
|
||||||
|
*/
|
||||||
|
public BlockRegistry(WorldEdit worldEdit) {
|
||||||
|
super(worldEdit);
|
||||||
|
|
||||||
|
parsers.add(new DefaultBlockParser(worldEdit));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a set of blocks from a comma-delimited list of blocks.
|
||||||
|
*
|
||||||
|
* @param input the input
|
||||||
|
* @param context the context
|
||||||
|
* @return a set of blocks
|
||||||
|
* @throws InputParseException thrown in error with the input
|
||||||
|
*/
|
||||||
|
public Set<BaseBlock> parseFromListInput(String input, ParserContext context) throws InputParseException {
|
||||||
|
Set<BaseBlock> blocks = new HashSet<BaseBlock>();
|
||||||
|
for (String token : input.split(",")) {
|
||||||
|
blocks.add(parseFromInput(token, context));
|
||||||
|
}
|
||||||
|
return blocks;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,307 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.*;
|
||||||
|
import com.sk89q.worldedit.blocks.*;
|
||||||
|
import com.sk89q.worldedit.extension.input.DisallowedUsageException;
|
||||||
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
import com.sk89q.worldedit.extension.input.NoMatchException;
|
||||||
|
import com.sk89q.worldedit.internal.registry.InputParser;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses block input strings.
|
||||||
|
*/
|
||||||
|
class DefaultBlockParser extends InputParser<BaseBlock> {
|
||||||
|
|
||||||
|
protected DefaultBlockParser(WorldEdit worldEdit) {
|
||||||
|
super(worldEdit);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static BaseBlock getBlockInHand(LocalPlayer player) throws InputParseException {
|
||||||
|
try {
|
||||||
|
return player.getBlockInHand();
|
||||||
|
} catch (NotABlockException e) {
|
||||||
|
throw new InputParseException("You're not holding a block!");
|
||||||
|
} catch (WorldEditException e) {
|
||||||
|
throw new InputParseException("Unknown error occurred: " + e.getMessage(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseBlock parseFromInput(String input, ParserContext context) throws InputParseException {
|
||||||
|
BlockType blockType;
|
||||||
|
input = input.replace("_", " ");
|
||||||
|
input = input.replace(";", "|");
|
||||||
|
String[] blockAndExtraData = input.split("\\|");
|
||||||
|
String[] typeAndData = blockAndExtraData[0].split(":", 2);
|
||||||
|
String testID = typeAndData[0];
|
||||||
|
|
||||||
|
int blockId = -1;
|
||||||
|
|
||||||
|
int data = -1;
|
||||||
|
|
||||||
|
boolean parseDataValue = true;
|
||||||
|
|
||||||
|
if ("hand".equalsIgnoreCase(testID)) {
|
||||||
|
// Get the block type from the item in the user's hand.
|
||||||
|
final BaseBlock blockInHand = getBlockInHand(context.requirePlayer());
|
||||||
|
if (blockInHand.getClass() != BaseBlock.class) {
|
||||||
|
return blockInHand;
|
||||||
|
}
|
||||||
|
|
||||||
|
blockId = blockInHand.getId();
|
||||||
|
blockType = BlockType.fromID(blockId);
|
||||||
|
data = blockInHand.getData();
|
||||||
|
} else if ("pos1".equalsIgnoreCase(testID)) {
|
||||||
|
// Get the block type from the "primary position"
|
||||||
|
final LocalWorld world = context.requireWorld();
|
||||||
|
final BlockVector primaryPosition;
|
||||||
|
try {
|
||||||
|
primaryPosition = context.requireSession().getRegionSelector(world).getPrimaryPosition();
|
||||||
|
} catch (IncompleteRegionException e) {
|
||||||
|
throw new InputParseException("Your selection is not complete.");
|
||||||
|
}
|
||||||
|
final BaseBlock blockInHand = world.getBlock(primaryPosition);
|
||||||
|
if (blockInHand.getClass() != BaseBlock.class) {
|
||||||
|
return blockInHand;
|
||||||
|
}
|
||||||
|
|
||||||
|
blockId = blockInHand.getId();
|
||||||
|
blockType = BlockType.fromID(blockId);
|
||||||
|
data = blockInHand.getData();
|
||||||
|
} else {
|
||||||
|
// Attempt to parse the item ID or otherwise resolve an item/block
|
||||||
|
// name to its numeric ID
|
||||||
|
try {
|
||||||
|
blockId = Integer.parseInt(testID);
|
||||||
|
blockType = BlockType.fromID(blockId);
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
blockType = BlockType.lookup(testID);
|
||||||
|
if (blockType == null) {
|
||||||
|
int t = worldEdit.getServer().resolveItem(testID);
|
||||||
|
if (t > 0) {
|
||||||
|
blockType = BlockType.fromID(t); // Could be null
|
||||||
|
blockId = t;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (blockId == -1 && blockType == null) {
|
||||||
|
// Maybe it's a cloth
|
||||||
|
ClothColor col = ClothColor.lookup(testID);
|
||||||
|
if (col == null) {
|
||||||
|
throw new NoMatchException("Unknown wool color '" + input + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
blockType = BlockType.CLOTH;
|
||||||
|
data = col.getID();
|
||||||
|
|
||||||
|
// Prevent overriding the data value
|
||||||
|
parseDataValue = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read block ID
|
||||||
|
if (blockId == -1) {
|
||||||
|
blockId = blockType.getID();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!context.requireWorld().isValidBlockType(blockId)) {
|
||||||
|
throw new NoMatchException("Does not match a valid block type: '" + input + "'");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!context.isPreferringWildcard() && data == -1) {
|
||||||
|
// No wildcards allowed => eliminate them.
|
||||||
|
data = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parseDataValue) { // Block data not yet detected
|
||||||
|
// Parse the block data (optional)
|
||||||
|
try {
|
||||||
|
if (typeAndData.length > 1 && typeAndData[1].length() > 0) {
|
||||||
|
data = Integer.parseInt(typeAndData[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data > 15) {
|
||||||
|
throw new NoMatchException("Invalid data value '" + typeAndData[1] + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data < 0 && (context.isRestricted() || data != -1)) {
|
||||||
|
data = 0;
|
||||||
|
}
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
if (blockType == null) {
|
||||||
|
throw new NoMatchException("Unknown data value '" + typeAndData[1] + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (blockType) {
|
||||||
|
case CLOTH:
|
||||||
|
case STAINED_CLAY:
|
||||||
|
case CARPET:
|
||||||
|
ClothColor col = ClothColor.lookup(typeAndData[1]);
|
||||||
|
if (col == null) {
|
||||||
|
throw new NoMatchException("Unknown wool color '" + typeAndData[1] + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
data = col.getID();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case STEP:
|
||||||
|
case DOUBLE_STEP:
|
||||||
|
BlockType dataType = BlockType.lookup(typeAndData[1]);
|
||||||
|
|
||||||
|
if (dataType == null) {
|
||||||
|
throw new NoMatchException("Unknown step type '" + typeAndData[1] + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (dataType) {
|
||||||
|
case STONE:
|
||||||
|
data = 0;
|
||||||
|
break;
|
||||||
|
case SANDSTONE:
|
||||||
|
data = 1;
|
||||||
|
break;
|
||||||
|
case WOOD:
|
||||||
|
data = 2;
|
||||||
|
break;
|
||||||
|
case COBBLESTONE:
|
||||||
|
data = 3;
|
||||||
|
break;
|
||||||
|
case BRICK:
|
||||||
|
data = 4;
|
||||||
|
break;
|
||||||
|
case STONE_BRICK:
|
||||||
|
data = 5;
|
||||||
|
break;
|
||||||
|
case NETHER_BRICK:
|
||||||
|
data = 6;
|
||||||
|
break;
|
||||||
|
case QUARTZ_BLOCK:
|
||||||
|
data = 7;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw new NoMatchException("Invalid step type '" + typeAndData[1] + "'");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw new NoMatchException("Unknown data value '" + typeAndData[1] + "'");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the item is allowed
|
||||||
|
LocalPlayer player = context.requirePlayer();
|
||||||
|
if (context.isRestricted() && player != null && !player.hasPermission("worldedit.anyblock")
|
||||||
|
&& worldEdit.getConfiguration().disallowedBlocks.contains(blockId)) {
|
||||||
|
throw new DisallowedUsageException("You are not allowed to use '" + input + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (blockType == null) {
|
||||||
|
return new BaseBlock(blockId, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (blockType) {
|
||||||
|
case SIGN_POST:
|
||||||
|
case WALL_SIGN:
|
||||||
|
// Allow special sign text syntax
|
||||||
|
String[] text = new String[4];
|
||||||
|
text[0] = blockAndExtraData.length > 1 ? blockAndExtraData[1] : "";
|
||||||
|
text[1] = blockAndExtraData.length > 2 ? blockAndExtraData[2] : "";
|
||||||
|
text[2] = blockAndExtraData.length > 3 ? blockAndExtraData[3] : "";
|
||||||
|
text[3] = blockAndExtraData.length > 4 ? blockAndExtraData[4] : "";
|
||||||
|
return new SignBlock(blockType.getID(), data, text);
|
||||||
|
|
||||||
|
case MOB_SPAWNER:
|
||||||
|
// Allow setting mob spawn type
|
||||||
|
if (blockAndExtraData.length > 1) {
|
||||||
|
String mobName = blockAndExtraData[1];
|
||||||
|
for (MobType mobType : MobType.values()) {
|
||||||
|
if (mobType.getName().toLowerCase().equals(mobName.toLowerCase())) {
|
||||||
|
mobName = mobType.getName();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!worldEdit.getServer().isValidMobType(mobName)) {
|
||||||
|
throw new NoMatchException("Unknown mob type '" + mobName + "'");
|
||||||
|
}
|
||||||
|
return new MobSpawnerBlock(data, mobName);
|
||||||
|
} else {
|
||||||
|
return new MobSpawnerBlock(data, MobType.PIG.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
case NOTE_BLOCK:
|
||||||
|
// Allow setting note
|
||||||
|
if (blockAndExtraData.length <= 1) {
|
||||||
|
return new NoteBlock(data, (byte) 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
byte note = Byte.parseByte(blockAndExtraData[1]);
|
||||||
|
if (note < 0 || note > 24) {
|
||||||
|
throw new InputParseException("Out of range note value: '" + blockAndExtraData[1] + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
return new NoteBlock(data, note);
|
||||||
|
|
||||||
|
case HEAD:
|
||||||
|
// allow setting type/player/rotation
|
||||||
|
if (blockAndExtraData.length <= 1) {
|
||||||
|
return new SkullBlock(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
byte rot = 0;
|
||||||
|
String type = "";
|
||||||
|
try {
|
||||||
|
rot = Byte.parseByte(blockAndExtraData[1]);
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
type = blockAndExtraData[1];
|
||||||
|
if (blockAndExtraData.length > 2) {
|
||||||
|
try {
|
||||||
|
rot = Byte.parseByte(blockAndExtraData[2]);
|
||||||
|
} catch (NumberFormatException e2) {
|
||||||
|
throw new InputParseException("Second part of skull metadata should be a number.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
byte skullType = 0;
|
||||||
|
// type is either the mob type or the player name
|
||||||
|
// sorry for the four minecraft accounts named "skeleton", "wither", "zombie", or "creeper"
|
||||||
|
if (!type.isEmpty()) {
|
||||||
|
if (type.equalsIgnoreCase("skeleton")) skullType = 0;
|
||||||
|
else if (type.equalsIgnoreCase("wither")) skullType = 1;
|
||||||
|
else if (type.equalsIgnoreCase("zombie")) skullType = 2;
|
||||||
|
else if (type.equalsIgnoreCase("creeper")) skullType = 4;
|
||||||
|
else skullType = 3;
|
||||||
|
}
|
||||||
|
if (skullType == 3) {
|
||||||
|
return new SkullBlock(data, rot, type.replace(" ", "_")); // valid MC usernames
|
||||||
|
} else {
|
||||||
|
return new SkullBlock(data, skullType, rot);
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
return new BaseBlock(blockId, data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,139 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.*;
|
||||||
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
import com.sk89q.worldedit.extension.input.NoMatchException;
|
||||||
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
|
import com.sk89q.worldedit.function.mask.*;
|
||||||
|
import com.sk89q.worldedit.internal.registry.InputParser;
|
||||||
|
import com.sk89q.worldedit.masks.BiomeTypeMask;
|
||||||
|
import com.sk89q.worldedit.math.noise.RandomNoise;
|
||||||
|
import com.sk89q.worldedit.session.request.Request;
|
||||||
|
import com.sk89q.worldedit.session.request.RequestSelection;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses mask input strings.
|
||||||
|
*/
|
||||||
|
class DefaultMaskParser extends InputParser<Mask> {
|
||||||
|
|
||||||
|
protected DefaultMaskParser(WorldEdit worldEdit) {
|
||||||
|
super(worldEdit);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Mask parseFromInput(String input, ParserContext context) throws InputParseException {
|
||||||
|
List<Mask> masks = new ArrayList<Mask>();
|
||||||
|
|
||||||
|
for (String component : input.split(" ")) {
|
||||||
|
if (component.length() == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
Mask current = getBlockMaskComponent(masks, component, context);
|
||||||
|
|
||||||
|
masks.add(current);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (masks.size()) {
|
||||||
|
case 0:
|
||||||
|
return null;
|
||||||
|
|
||||||
|
case 1:
|
||||||
|
return masks.get(0);
|
||||||
|
|
||||||
|
default:
|
||||||
|
return new MaskIntersection(masks);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Mask getBlockMaskComponent(List<Mask> masks, String component, ParserContext context) throws InputParseException {
|
||||||
|
Extent extent = Request.request().getEditSession();
|
||||||
|
|
||||||
|
final char firstChar = component.charAt(0);
|
||||||
|
switch (firstChar) {
|
||||||
|
case '#':
|
||||||
|
if (component.equalsIgnoreCase("#existing")) {
|
||||||
|
return new ExistingBlockMask(extent);
|
||||||
|
} else if (component.equalsIgnoreCase("#solid")) {
|
||||||
|
return new SolidBlockMask(extent);
|
||||||
|
} else if (component.equalsIgnoreCase("#dregion")
|
||||||
|
|| component.equalsIgnoreCase("#dselection")
|
||||||
|
|| component.equalsIgnoreCase("#dsel")) {
|
||||||
|
return new RegionMask(new RequestSelection());
|
||||||
|
} else if (component.equalsIgnoreCase("#selection")
|
||||||
|
|| component.equalsIgnoreCase("#region")
|
||||||
|
|| component.equalsIgnoreCase("#sel")) {
|
||||||
|
try {
|
||||||
|
return new RegionMask(context.requireSession().getSelection(context.requireWorld()).clone());
|
||||||
|
} catch (IncompleteRegionException e) {
|
||||||
|
throw new InputParseException("Please make a selection first.");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new NoMatchException("Unrecognized mask '" + component + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
case '>':
|
||||||
|
case '<':
|
||||||
|
Mask submask;
|
||||||
|
if (component.length() > 1) {
|
||||||
|
submask = getBlockMaskComponent(masks, component.substring(1), context);
|
||||||
|
} else {
|
||||||
|
submask = new ExistingBlockMask(extent);
|
||||||
|
}
|
||||||
|
OffsetMask offsetMask = new OffsetMask(submask, new Vector(0, firstChar == '>' ? -1 : 1, 0));
|
||||||
|
return new MaskIntersection(offsetMask, Masks.negate(submask));
|
||||||
|
|
||||||
|
case '$':
|
||||||
|
Set<BiomeType> biomes = new HashSet<BiomeType>();
|
||||||
|
String[] biomesList = component.substring(1).split(",");
|
||||||
|
for (String biomeName : biomesList) {
|
||||||
|
try {
|
||||||
|
BiomeType biome = worldEdit.getServer().getBiomes().get(biomeName);
|
||||||
|
biomes.add(biome);
|
||||||
|
} catch (UnknownBiomeTypeException e) {
|
||||||
|
throw new InputParseException("Unknown biome '" + biomeName + "'");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Masks.wrap(new BiomeTypeMask(biomes));
|
||||||
|
|
||||||
|
case '%':
|
||||||
|
int i = Integer.parseInt(component.substring(1));
|
||||||
|
return new NoiseFilter(new RandomNoise(), ((double) i) / 100);
|
||||||
|
|
||||||
|
case '!':
|
||||||
|
if (component.length() > 1) {
|
||||||
|
return Masks.negate(getBlockMaskComponent(masks, component.substring(1), context));
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
return new BlockMask(extent, worldEdit.getBlockRegistry().parseFromInput(component, context));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.EmptyClipboardException;
|
||||||
|
import com.sk89q.worldedit.LocalSession;
|
||||||
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
|
import com.sk89q.worldedit.function.pattern.ClipboardPattern;
|
||||||
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
|
import com.sk89q.worldedit.internal.registry.InputParser;
|
||||||
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
|
||||||
|
class HashTagPatternParser extends InputParser<Pattern> {
|
||||||
|
|
||||||
|
HashTagPatternParser(WorldEdit worldEdit) {
|
||||||
|
super(worldEdit);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Pattern parseFromInput(String input, ParserContext context) throws InputParseException {
|
||||||
|
if (input.charAt(0) == '#') {
|
||||||
|
if (!input.equals("#clipboard") && !input.equals("#copy")) {
|
||||||
|
throw new InputParseException("#clipboard or #copy is acceptable for patterns starting with #");
|
||||||
|
}
|
||||||
|
|
||||||
|
LocalSession session = context.requireSession();
|
||||||
|
|
||||||
|
if (session != null) {
|
||||||
|
try {
|
||||||
|
return new ClipboardPattern(session.getClipboard());
|
||||||
|
} catch (EmptyClipboardException e) {
|
||||||
|
throw new InputParseException("To use #clipboard, please first copy something to your clipboard");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new InputParseException("No session is available, so no clipboard is available");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.function.mask.Mask;
|
||||||
|
import com.sk89q.worldedit.internal.registry.AbstractRegistry;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A registry of known {@link Mask}s. Provides methods to instantiate
|
||||||
|
* new masks from input.
|
||||||
|
* </p>
|
||||||
|
* Instances of this class can be taken from
|
||||||
|
* {@link WorldEdit#getMaskRegistry()}.
|
||||||
|
*/
|
||||||
|
public final class MaskRegistry extends AbstractRegistry<Mask> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new mask registry.
|
||||||
|
*
|
||||||
|
* @param worldEdit the WorldEdit instance
|
||||||
|
*/
|
||||||
|
public MaskRegistry(WorldEdit worldEdit) {
|
||||||
|
super(worldEdit);
|
||||||
|
|
||||||
|
parsers.add(new DefaultMaskParser(worldEdit));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
|
import com.sk89q.worldedit.internal.registry.AbstractRegistry;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A registry of known {@link Pattern}s. Provides methods to instantiate
|
||||||
|
* new patterns from input.
|
||||||
|
* </p>
|
||||||
|
* Instances of this class can be taken from
|
||||||
|
* {@link WorldEdit#getPatternRegistry()}.
|
||||||
|
*/
|
||||||
|
public final class PatternRegistry extends AbstractRegistry<Pattern> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new instance.
|
||||||
|
*
|
||||||
|
* @param worldEdit the WorldEdit instance
|
||||||
|
*/
|
||||||
|
public PatternRegistry(WorldEdit worldEdit) {
|
||||||
|
super(worldEdit);
|
||||||
|
|
||||||
|
parsers.add(new HashTagPatternParser(worldEdit));
|
||||||
|
parsers.add(new SingleBlockPatternParser(worldEdit));
|
||||||
|
parsers.add(new RandomPatternParser(worldEdit));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.blocks.BaseBlock;
|
||||||
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
import com.sk89q.worldedit.function.pattern.BlockPattern;
|
||||||
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
|
import com.sk89q.worldedit.function.pattern.RandomPattern;
|
||||||
|
import com.sk89q.worldedit.internal.registry.InputParser;
|
||||||
|
|
||||||
|
class RandomPatternParser extends InputParser<Pattern> {
|
||||||
|
|
||||||
|
RandomPatternParser(WorldEdit worldEdit) {
|
||||||
|
super(worldEdit);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Pattern parseFromInput(String input, ParserContext context) throws InputParseException {
|
||||||
|
BlockRegistry blockRegistry = worldEdit.getBlockRegistry();
|
||||||
|
RandomPattern randomPattern = new RandomPattern();
|
||||||
|
|
||||||
|
for (String token : input.split(",")) {
|
||||||
|
BaseBlock block;
|
||||||
|
|
||||||
|
double chance;
|
||||||
|
|
||||||
|
// Parse special percentage syntax
|
||||||
|
if (token.matches("[0-9]+(\\.[0-9]*)?%.*")) {
|
||||||
|
String[] p = token.split("%");
|
||||||
|
|
||||||
|
if (p.length < 2) {
|
||||||
|
throw new InputParseException("Missing the type after the % symbol for '" + input + "'");
|
||||||
|
} else {
|
||||||
|
chance = Double.parseDouble(p[0]);
|
||||||
|
block = blockRegistry.parseFromInput(p[1], context);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
chance = 1;
|
||||||
|
block = blockRegistry.parseFromInput(token, context);
|
||||||
|
}
|
||||||
|
|
||||||
|
randomPattern.add(new BlockPattern(block), chance);
|
||||||
|
}
|
||||||
|
|
||||||
|
return randomPattern;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.extension.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
|
import com.sk89q.worldedit.function.pattern.BlockPattern;
|
||||||
|
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||||
|
import com.sk89q.worldedit.internal.registry.InputParser;
|
||||||
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
|
||||||
|
class SingleBlockPatternParser extends InputParser<Pattern> {
|
||||||
|
|
||||||
|
SingleBlockPatternParser(WorldEdit worldEdit) {
|
||||||
|
super(worldEdit);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Pattern parseFromInput(String input, ParserContext context) throws InputParseException {
|
||||||
|
String[] items = input.split(",");
|
||||||
|
|
||||||
|
if (items.length == 1) {
|
||||||
|
return new BlockPattern(worldEdit.getBlockRegistry().parseFromInput(items[0], context));
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -19,6 +19,8 @@
|
|||||||
|
|
||||||
package com.sk89q.worldedit.extent;
|
package com.sk89q.worldedit.extent;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.Vector;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A world, portion of a world, clipboard, or other object that can have blocks
|
* A world, portion of a world, clipboard, or other object that can have blocks
|
||||||
* set or entities placed.
|
* set or entities placed.
|
||||||
@ -27,4 +29,25 @@ package com.sk89q.worldedit.extent;
|
|||||||
* @see OutputExtent the set____() portion
|
* @see OutputExtent the set____() portion
|
||||||
*/
|
*/
|
||||||
public interface Extent extends InputExtent, OutputExtent {
|
public interface Extent extends InputExtent, OutputExtent {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the minimum point in the extent.
|
||||||
|
* </p>
|
||||||
|
* If the extent is unbounded, then a large (negative) value may
|
||||||
|
* be returned.
|
||||||
|
*
|
||||||
|
* @return the minimum point
|
||||||
|
*/
|
||||||
|
Vector getMinimumPoint();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the maximum point in the extent.
|
||||||
|
* </p>
|
||||||
|
* If the extent is unbounded, then a large (positive) value may
|
||||||
|
* be returned.
|
||||||
|
*
|
||||||
|
* @return the maximum point
|
||||||
|
*/
|
||||||
|
Vector getMaximumPoint();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -70,6 +70,16 @@ public class ExtentDelegate implements Extent {
|
|||||||
return extent.setBlock(location, block);
|
return extent.setBlock(location, block);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMinimumPoint() {
|
||||||
|
return extent.getMinimumPoint();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMaximumPoint() {
|
||||||
|
return extent.getMaximumPoint();
|
||||||
|
}
|
||||||
|
|
||||||
protected Operation commitBefore() {
|
protected Operation commitBefore() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@ -88,4 +98,5 @@ public class ExtentDelegate implements Extent {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,9 +19,8 @@
|
|||||||
|
|
||||||
package com.sk89q.worldedit.function.mask;
|
package com.sk89q.worldedit.function.mask;
|
||||||
|
|
||||||
import com.sk89q.worldedit.EditSession;
|
import com.sk89q.worldedit.*;
|
||||||
import com.sk89q.worldedit.Vector;
|
import com.sk89q.worldedit.session.request.Request;
|
||||||
import com.sk89q.worldedit.Vector2D;
|
|
||||||
|
|
||||||
import static com.google.common.base.Preconditions.checkNotNull;
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
|
||||||
@ -95,12 +94,19 @@ public final class Masks {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrap an old-style mask and convert it to a new mask.
|
* Wrap an old-style mask and convert it to a new mask.
|
||||||
|
* </p>
|
||||||
|
* Note, however, that this is strongly not recommended because
|
||||||
|
* {@link com.sk89q.worldedit.masks.Mask#prepare(LocalSession, LocalPlayer, Vector)}
|
||||||
|
* is not called.
|
||||||
*
|
*
|
||||||
* @param editSession the edit session to bind to
|
|
||||||
* @param mask the old-style mask
|
* @param mask the old-style mask
|
||||||
|
* @param editSession the edit session to bind to
|
||||||
* @return a new-style mask
|
* @return a new-style mask
|
||||||
|
* @deprecated Please avoid if possible
|
||||||
*/
|
*/
|
||||||
public static Mask wrap(final EditSession editSession, final com.sk89q.worldedit.masks.Mask mask) {
|
@Deprecated
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public static Mask wrap(final com.sk89q.worldedit.masks.Mask mask, final EditSession editSession) {
|
||||||
checkNotNull(mask);
|
checkNotNull(mask);
|
||||||
return new AbstractMask() {
|
return new AbstractMask() {
|
||||||
@Override
|
@Override
|
||||||
@ -110,4 +116,44 @@ public final class Masks {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wrap an old-style mask and convert it to a new mask.
|
||||||
|
* </p>
|
||||||
|
* As an {@link EditSession} is not provided in this case, one will be
|
||||||
|
* taken from the {@link Request}, if possible. If not possible, then the
|
||||||
|
* mask will return false.
|
||||||
|
*
|
||||||
|
* @param mask the old-style mask
|
||||||
|
* @return a new-style mask
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public static Mask wrap(final com.sk89q.worldedit.masks.Mask mask) {
|
||||||
|
checkNotNull(mask);
|
||||||
|
return new AbstractMask() {
|
||||||
|
@Override
|
||||||
|
public boolean test(Vector vector) {
|
||||||
|
EditSession editSession = Request.request().getEditSession();
|
||||||
|
return editSession != null && mask.matches(editSession, vector);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert a new-style mask to an old-style mask.
|
||||||
|
*
|
||||||
|
* @param mask the new-style mask
|
||||||
|
* @return an old-style mask
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public static com.sk89q.worldedit.masks.Mask wrap(final Mask mask) {
|
||||||
|
checkNotNull(mask);
|
||||||
|
return new com.sk89q.worldedit.masks.AbstractMask() {
|
||||||
|
@Override
|
||||||
|
public boolean matches(EditSession editSession, Vector pos) {
|
||||||
|
Request.request().setEditSession(editSession);
|
||||||
|
return mask.test(pos);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
90
src/main/java/com/sk89q/worldedit/function/mask/OffsetMask.java
Normale Datei
90
src/main/java/com/sk89q/worldedit/function/mask/OffsetMask.java
Normale Datei
@ -0,0 +1,90 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.function.mask;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.Vector;
|
||||||
|
|
||||||
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether the provided mask tests true for an offset position.
|
||||||
|
*/
|
||||||
|
public class OffsetMask extends AbstractMask {
|
||||||
|
|
||||||
|
private Mask mask;
|
||||||
|
private Vector offset;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new instance.
|
||||||
|
*
|
||||||
|
* @param mask the mask
|
||||||
|
* @param offset the offset
|
||||||
|
*/
|
||||||
|
public OffsetMask(Mask mask, Vector offset) {
|
||||||
|
checkNotNull(mask);
|
||||||
|
checkNotNull(offset);
|
||||||
|
this.mask = mask;
|
||||||
|
this.offset = offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the mask.
|
||||||
|
*
|
||||||
|
* @return the mask
|
||||||
|
*/
|
||||||
|
public Mask getMask() {
|
||||||
|
return mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the mask.
|
||||||
|
*
|
||||||
|
* @param mask the mask
|
||||||
|
*/
|
||||||
|
public void setMask(Mask mask) {
|
||||||
|
checkNotNull(mask);
|
||||||
|
this.mask = mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the offset.
|
||||||
|
*
|
||||||
|
* @return the offset
|
||||||
|
*/
|
||||||
|
public Vector getOffset() {
|
||||||
|
return offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the offset.
|
||||||
|
*
|
||||||
|
* @param offset the offset
|
||||||
|
*/
|
||||||
|
public void setOffset(Vector offset) {
|
||||||
|
checkNotNull(offset);
|
||||||
|
this.offset = offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean test(Vector vector) {
|
||||||
|
return getMask().test(vector.add(offset));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.function.pattern;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.CuboidClipboard;
|
||||||
|
import com.sk89q.worldedit.Vector;
|
||||||
|
import com.sk89q.worldedit.blocks.BaseBlock;
|
||||||
|
|
||||||
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A pattern that reads from {@link CuboidClipboard}.
|
||||||
|
*
|
||||||
|
* @deprecated May be removed without notice, but there is no direct replacement yet
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public class ClipboardPattern extends AbstractPattern {
|
||||||
|
|
||||||
|
private final CuboidClipboard clipboard;
|
||||||
|
private final Vector size;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new clipboard pattern.
|
||||||
|
*
|
||||||
|
* @param clipboard the clipboard
|
||||||
|
*/
|
||||||
|
public ClipboardPattern(CuboidClipboard clipboard) {
|
||||||
|
checkNotNull(clipboard);
|
||||||
|
this.clipboard = clipboard;
|
||||||
|
this.size = clipboard.getSize();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseBlock apply(Vector position) {
|
||||||
|
int xp = Math.abs(position.getBlockX()) % size.getBlockX();
|
||||||
|
int yp = Math.abs(position.getBlockY()) % size.getBlockY();
|
||||||
|
int zp = Math.abs(position.getBlockZ()) % size.getBlockZ();
|
||||||
|
|
||||||
|
return clipboard.getPoint(new Vector(xp, yp, zp));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -48,4 +48,25 @@ public final class Patterns {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wrap a new-style pattern and return an old-style pattern.
|
||||||
|
*
|
||||||
|
* @param pattern the pattern
|
||||||
|
* @return an old-style pattern
|
||||||
|
*/
|
||||||
|
public static com.sk89q.worldedit.patterns.Pattern wrap(final Pattern pattern) {
|
||||||
|
checkNotNull(pattern);
|
||||||
|
return new com.sk89q.worldedit.patterns.Pattern() {
|
||||||
|
@Override
|
||||||
|
public BaseBlock next(Vector position) {
|
||||||
|
return pattern.apply(position);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseBlock next(int x, int y, int z) {
|
||||||
|
return next(new Vector(x, y, z));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,95 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.function.pattern;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.Vector;
|
||||||
|
import com.sk89q.worldedit.blocks.BaseBlock;
|
||||||
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
|
|
||||||
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the blocks from {@link Extent}, repeating when out of bounds.
|
||||||
|
*/
|
||||||
|
public class RepeatingExtentPattern extends AbstractPattern {
|
||||||
|
|
||||||
|
private Extent extent;
|
||||||
|
private Vector offset;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new instance.
|
||||||
|
*
|
||||||
|
* @param extent the extent
|
||||||
|
* @param offset the offset
|
||||||
|
*/
|
||||||
|
public RepeatingExtentPattern(Extent extent, Vector offset) {
|
||||||
|
setExtent(extent);
|
||||||
|
setOffset(offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the extent.
|
||||||
|
*
|
||||||
|
* @return the extent
|
||||||
|
*/
|
||||||
|
public Extent getExtent() {
|
||||||
|
return extent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the extent.
|
||||||
|
*
|
||||||
|
* @param extent the extent
|
||||||
|
*/
|
||||||
|
public void setExtent(Extent extent) {
|
||||||
|
checkNotNull(extent);
|
||||||
|
this.extent = extent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the offset.
|
||||||
|
*
|
||||||
|
* @return the offset
|
||||||
|
*/
|
||||||
|
public Vector getOffset() {
|
||||||
|
return offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the offset.
|
||||||
|
*
|
||||||
|
* @param offset the offset
|
||||||
|
*/
|
||||||
|
public void setOffset(Vector offset) {
|
||||||
|
checkNotNull(offset);
|
||||||
|
this.offset = offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseBlock apply(Vector position) {
|
||||||
|
Vector base = position.add(offset);
|
||||||
|
Vector size = extent.getMaximumPoint().subtract(extent.getMinimumPoint());
|
||||||
|
int x = base.getBlockX() % size.getBlockX();
|
||||||
|
int y = base.getBlockY() % size.getBlockY();
|
||||||
|
int z = base.getBlockZ() % size.getBlockZ();
|
||||||
|
return extent.getBlock(new Vector(x, y, z));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.internal.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
import com.sk89q.worldedit.extension.input.NoMatchException;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An abstract implementation of a registry for internal usage.
|
||||||
|
*
|
||||||
|
* @param <E> the element that the registry returns
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("ProtectedField")
|
||||||
|
public abstract class AbstractRegistry<E> {
|
||||||
|
|
||||||
|
protected final WorldEdit worldEdit;
|
||||||
|
protected final List<InputParser<E>> parsers = new ArrayList<InputParser<E>>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new registry.
|
||||||
|
*
|
||||||
|
* @param worldEdit the WorldEdit instance
|
||||||
|
*/
|
||||||
|
protected AbstractRegistry(WorldEdit worldEdit) {
|
||||||
|
checkNotNull(worldEdit);
|
||||||
|
this.worldEdit = worldEdit;
|
||||||
|
}
|
||||||
|
|
||||||
|
public E parseFromInput(String input, ParserContext context) throws InputParseException {
|
||||||
|
E match;
|
||||||
|
|
||||||
|
for (InputParser<E> parser : parsers) {
|
||||||
|
match = parser.parseFromInput(input, context);
|
||||||
|
|
||||||
|
if (match != null) {
|
||||||
|
return match;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new NoMatchException("No match for '" + input + "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
42
src/main/java/com/sk89q/worldedit/internal/registry/InputParser.java
Normale Datei
42
src/main/java/com/sk89q/worldedit/internal/registry/InputParser.java
Normale Datei
@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.internal.registry;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
import com.sk89q.worldedit.extension.input.ParserContext;
|
||||||
|
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Input parser interface for {@link AbstractRegistry}.
|
||||||
|
*
|
||||||
|
* @param <E> the element
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("ProtectedField")
|
||||||
|
public abstract class InputParser<E> {
|
||||||
|
|
||||||
|
protected final WorldEdit worldEdit;
|
||||||
|
|
||||||
|
protected InputParser(WorldEdit worldEdit) {
|
||||||
|
this.worldEdit = worldEdit;
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract E parseFromInput(String input, ParserContext context) throws InputParseException;
|
||||||
|
|
||||||
|
}
|
||||||
139
src/main/java/com/sk89q/worldedit/regions/NullRegion.java
Normale Datei
139
src/main/java/com/sk89q/worldedit/regions/NullRegion.java
Normale Datei
@ -0,0 +1,139 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.regions;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.*;
|
||||||
|
import com.sk89q.worldedit.Vector;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A region that contains no points.
|
||||||
|
*/
|
||||||
|
public class NullRegion implements Region {
|
||||||
|
|
||||||
|
private LocalWorld world;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMinimumPoint() {
|
||||||
|
return new Vector(0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMaximumPoint() {
|
||||||
|
return new Vector(0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getCenter() {
|
||||||
|
return new Vector(0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getArea() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getWidth() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getHeight() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getLength() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void expand(Vector... changes) throws RegionOperationException {
|
||||||
|
throw new RegionOperationException("Cannot change NullRegion");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void contract(Vector... changes) throws RegionOperationException {
|
||||||
|
throw new RegionOperationException("Cannot change NullRegion");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void shift(Vector change) throws RegionOperationException {
|
||||||
|
throw new RegionOperationException("Cannot change NullRegion");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean contains(Vector pt) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<Vector2D> getChunks() {
|
||||||
|
return Collections.emptySet();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<Vector> getChunkCubes() {
|
||||||
|
return Collections.emptySet();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LocalWorld getWorld() {
|
||||||
|
return world;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setWorld(LocalWorld world) {
|
||||||
|
this.world = world;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public NullRegion clone() {
|
||||||
|
return new NullRegion();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<BlockVector2D> polygonize(int maxPoints) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Iterator<BlockVector> iterator() {
|
||||||
|
return new Iterator<BlockVector>() {
|
||||||
|
@Override
|
||||||
|
public boolean hasNext() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BlockVector next() {
|
||||||
|
throw new NoSuchElementException();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void remove() {
|
||||||
|
throw new UnsupportedOperationException("Cannot remove");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
116
src/main/java/com/sk89q/worldedit/session/request/Request.java
Normale Datei
116
src/main/java/com/sk89q/worldedit/session/request/Request.java
Normale Datei
@ -0,0 +1,116 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.session.request;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.EditSession;
|
||||||
|
import com.sk89q.worldedit.LocalSession;
|
||||||
|
import com.sk89q.worldedit.LocalWorld;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Describes the current request using a {@link ThreadLocal}.
|
||||||
|
*/
|
||||||
|
public final class Request {
|
||||||
|
|
||||||
|
private static final ThreadLocal<Request> threadLocal =
|
||||||
|
new ThreadLocal<Request>() {
|
||||||
|
@Override protected Request initialValue() {
|
||||||
|
return new Request();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private @Nullable LocalWorld world;
|
||||||
|
private @Nullable LocalSession session;
|
||||||
|
private @Nullable EditSession editSession;
|
||||||
|
|
||||||
|
private Request() {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the request world.
|
||||||
|
*
|
||||||
|
* @return the world, which may be null
|
||||||
|
*/
|
||||||
|
public @Nullable LocalWorld getWorld() {
|
||||||
|
return world;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the request world.
|
||||||
|
*
|
||||||
|
* @param world the world, which may be null
|
||||||
|
*/
|
||||||
|
public void setWorld(@Nullable LocalWorld world) {
|
||||||
|
this.world = world;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the request session.
|
||||||
|
*
|
||||||
|
* @return the session, which may be null
|
||||||
|
*/
|
||||||
|
public @Nullable LocalSession getSession() {
|
||||||
|
return session;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the request session.
|
||||||
|
*
|
||||||
|
* @param session the session, which may be null
|
||||||
|
*/
|
||||||
|
public void setSession(@Nullable LocalSession session) {
|
||||||
|
this.session = session;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the {@link EditSession}.
|
||||||
|
*
|
||||||
|
* @return the edit session, which may be null
|
||||||
|
*/
|
||||||
|
public @Nullable EditSession getEditSession() {
|
||||||
|
return editSession;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the {@link EditSession}.
|
||||||
|
*
|
||||||
|
* @param editSession the edit session, which may be null
|
||||||
|
*/
|
||||||
|
public void setEditSession(@Nullable EditSession editSession) {
|
||||||
|
this.editSession = editSession;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current request, which is specific to the current thread.
|
||||||
|
*
|
||||||
|
* @return the current request
|
||||||
|
*/
|
||||||
|
public static Request request() {
|
||||||
|
return threadLocal.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reset the current request and clear all fields.
|
||||||
|
*/
|
||||||
|
public static void reset() {
|
||||||
|
threadLocal.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
150
src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java
Normale Datei
150
src/main/java/com/sk89q/worldedit/session/request/RequestSelection.java
Normale Datei
@ -0,0 +1,150 @@
|
|||||||
|
/*
|
||||||
|
* 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 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.session.request;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.*;
|
||||||
|
import com.sk89q.worldedit.regions.NullRegion;
|
||||||
|
import com.sk89q.worldedit.regions.Region;
|
||||||
|
import com.sk89q.worldedit.regions.RegionOperationException;
|
||||||
|
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A region that mirrors the current selection according to the current
|
||||||
|
* {@link LocalSession} and {@link LocalWorld} set on the current
|
||||||
|
* {@link Request}.
|
||||||
|
* </p>
|
||||||
|
* If a selection cannot be taken, then the selection will be assumed to be
|
||||||
|
* that of a {@link NullRegion}.
|
||||||
|
*/
|
||||||
|
public class RequestSelection implements Region {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the delegate region.
|
||||||
|
*
|
||||||
|
* @return the delegate region
|
||||||
|
*/
|
||||||
|
protected Region getRegion() {
|
||||||
|
LocalSession session = Request.request().getSession();
|
||||||
|
LocalWorld world = Request.request().getWorld();
|
||||||
|
|
||||||
|
if (session != null && world != null) {
|
||||||
|
try {
|
||||||
|
return session.getSelection(world);
|
||||||
|
} catch (IncompleteRegionException ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new NullRegion();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMinimumPoint() {
|
||||||
|
return getRegion().getMinimumPoint();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getMaximumPoint() {
|
||||||
|
return getRegion().getMaximumPoint();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vector getCenter() {
|
||||||
|
return getRegion().getCenter();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getArea() {
|
||||||
|
return getRegion().getArea();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getWidth() {
|
||||||
|
return getRegion().getWidth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getHeight() {
|
||||||
|
return getRegion().getHeight();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getLength() {
|
||||||
|
return getRegion().getLength();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void expand(Vector... changes) throws RegionOperationException {
|
||||||
|
getRegion().expand(changes);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void contract(Vector... changes) throws RegionOperationException {
|
||||||
|
getRegion().contract(changes);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void shift(Vector change) throws RegionOperationException {
|
||||||
|
getRegion().shift(change);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean contains(Vector pt) {
|
||||||
|
return getRegion().contains(pt);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<Vector2D> getChunks() {
|
||||||
|
return getRegion().getChunks();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<Vector> getChunkCubes() {
|
||||||
|
return getRegion().getChunkCubes();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LocalWorld getWorld() {
|
||||||
|
return getRegion().getWorld();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setWorld(LocalWorld world) {
|
||||||
|
getRegion().setWorld(world);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Region clone() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<BlockVector2D> polygonize(int maxPoints) {
|
||||||
|
return getRegion().polygonize(maxPoints);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Iterator<BlockVector> iterator() {
|
||||||
|
return getRegion().iterator();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren