From b3eb1fc5486bf5123f88cc4fc6745a092cb88904 Mon Sep 17 00:00:00 2001 From: sk89q Date: Sat, 2 Oct 2010 16:44:20 -0700 Subject: [PATCH] Gave /editreplace the ability to discriminate on block type to replace. Corrected arguments help for /editscript. --- src/WorldEdit.java | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/WorldEdit.java b/src/WorldEdit.java index 89de13769..2cf023ea4 100644 --- a/src/WorldEdit.java +++ b/src/WorldEdit.java @@ -55,14 +55,14 @@ public class WorldEdit extends Plugin { commands.put("/clearhistory", "Clear history"); commands.put("/editsize", "Get size of selected region"); commands.put("/editset", " - Set all blocks inside region"); - commands.put("/editreplace", " - Replace all existing blocks inside region"); + commands.put("/editreplace", " - Replace all existing blocks inside region"); commands.put("/editoverlay", " - Overlay the area one layer"); commands.put("/removeabove", " - Remove blocks above head"); commands.put("/editcopy", "Copies the currently selected region"); commands.put("/editpaste", "Pastes the clipboard"); commands.put("/editpasteair", "Pastes the clipboard (with air)"); commands.put("/editfill", " - Fill a hole"); - commands.put("/editscript", " [Args...] - Run an editscript"); + commands.put("/editscript", "[Filename] - Run an editscript"); } /** @@ -121,8 +121,8 @@ public class WorldEdit extends Plugin { * @throws UnknownItemException * @throws DisallowedItemException */ - private int getItem(String id) throws UnknownItemException, - DisallowedItemException { + private int getItem(String id, boolean allAllowed) + throws UnknownItemException, DisallowedItemException { int foundID; try { @@ -136,7 +136,7 @@ public class WorldEdit extends Plugin { } // All items allowed - if (allowedBlocks[0].equals("")) { + if (allAllowed || allowedBlocks[0].equals("")) { return foundID; } @@ -149,6 +149,19 @@ public class WorldEdit extends Plugin { throw new DisallowedItemException(); } + /** + * Get an item ID from an item name or an item ID number. + * + * @param id + * @return + * @throws UnknownItemException + * @throws DisallowedItemException + */ + private int getItem(String id) throws UnknownItemException, + DisallowedItemException { + return getItem(id, false); + } + /** * * @override @@ -432,13 +445,15 @@ public class WorldEdit extends Plugin { } else if(split[0].equalsIgnoreCase("/editreplace")) { checkArgs(split, 1); int blockType = getItem(split[1]); + int replaceType = split.length > 2 ? getItem(split[2], true) : -1; int affected = 0; for (int x = lowerX; x <= upperX; x++) { for (int y = lowerY; y <= upperY; y++) { for (int z = lowerZ; z <= upperZ; z++) { - if (editSession.getBlock(x, y, z) != 0) { + if ((replaceType == -1 && editSession.getBlock(x, y, z) != 0) || + (editSession.getBlock(x, y, z) == replaceType)) { editSession.setBlock(x, y, z, blockType); affected++; }