/tree now makes regular tree and /bigtree makes big trees.

This commit is contained in:
sk89q 2011-01-09 10:22:01 -08:00
parent d997dbac2b
commit cdea296396
8 changed files with 118 additions and 8 deletions

View File

@ -18,6 +18,7 @@
*/ */
import java.util.Random; import java.util.Random;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalWorld; import com.sk89q.worldedit.LocalWorld;
@ -279,8 +280,26 @@ public class HMWorld extends LocalWorld {
try { try {
return MinecraftServerInterface.generateTree(editSession, pt); return MinecraftServerInterface.generateTree(editSession, pt);
} catch (Throwable t) { } catch (Throwable t) {
logger.severe("Failed to create tree (do you need to update WorldEdit due to a Minecraft update?): " logger.log(Level.SEVERE,
+ t.getMessage()); "Failed to create tree (do you need to update WorldEdit " +
"due to a Minecraft update?)", t);
return false;
}
}
/**
* Generate a big tree at a location.
*
* @param pt
* @return
*/
public boolean generateBigTree(EditSession editSession, Vector pt) {
try {
return MinecraftServerInterface.generateBigTree(editSession, pt);
} catch (Throwable t) {
logger.log(Level.SEVERE,
"Failed to create big tree (do you need to update WorldEdit " +
"due to a Minecraft update?)", t);
return false; return false;
} }
} }

View File

@ -43,12 +43,13 @@ public class MinecraftServerInterface {
private static MinecraftSetBlockProxy proxy; private static MinecraftSetBlockProxy proxy;
/** /**
* Generate a tree at a location. * Perform world generation at a location.
* *
* @param pt * @param pt
* @return * @return
*/ */
public static boolean generateTree(EditSession editSession, Vector pt) { private static boolean performWorldGen(EditSession editSession, Vector pt,
bt worldGen) {
if (proxy == null) { if (proxy == null) {
try { try {
proxy = createNoConstructor(MinecraftSetBlockProxy.class); proxy = createNoConstructor(MinecraftSetBlockProxy.class);
@ -60,11 +61,31 @@ public class MinecraftServerInterface {
} }
proxy.setEditSession(editSession); proxy.setEditSession(editSession);
bt treeGen = new ib(); bt gen = worldGen;
return treeGen.a(proxy, random, return gen.a(proxy, random,
pt.getBlockX(), pt.getBlockY() + 1, pt.getBlockZ()); pt.getBlockX(), pt.getBlockY() + 1, pt.getBlockZ());
} }
/**
* Generate a tree at a location.
*
* @param pt
* @return
*/
public static boolean generateTree(EditSession editSession, Vector pt) {
return performWorldGen(editSession, pt, new kl());
}
/**
* Generate a big tree at a location.
*
* @param pt
* @return
*/
public static boolean generateBigTree(EditSession editSession, Vector pt) {
return performWorldGen(editSession, pt, new ib());
}
/** /**
* Get mob spawner mob type. May return an empty string. * Get mob spawner mob type. May return an empty string.
* *

View File

@ -1863,7 +1863,7 @@ public class EditSession {
if (pineTree) { if (pineTree) {
makePineTree(new Vector(x, y + 1, z)); makePineTree(new Vector(x, y + 1, z));
} else { } else {
world.generateTree(this, new Vector(x, y + 1, z)); world.generateBigTree(this, new Vector(x, y + 1, z));
} }
affected++; affected++;
break; break;

View File

@ -128,6 +128,14 @@ public abstract class LocalWorld {
*/ */
public abstract boolean generateTree(EditSession editSession, Vector pt); public abstract boolean generateTree(EditSession editSession, Vector pt);
/**
* Generate a big tree at a location.
*
* @param pt
* @return
*/
public abstract boolean generateBigTree(EditSession editSession, Vector pt);
/** /**
* Drop an item. * Drop an item.
* *

View File

@ -134,6 +134,7 @@ public class WorldEditController {
commands.put("/none", "Switch to no tool"); commands.put("/none", "Switch to no tool");
commands.put("/info", "Switch to the info tool"); commands.put("/info", "Switch to the info tool");
commands.put("/tree", "Switch to the tree tool"); commands.put("/tree", "Switch to the tree tool");
commands.put("/bigtree", "Switch to the big tree tool");
commands.put("/repl", "[ID] - Switch to the block replacer tool"); commands.put("/repl", "[ID] - Switch to the block replacer tool");
commands.put("//expand", "[Num] <Dir> - Expands the selection"); commands.put("//expand", "[Num] <Dir> - Expands the selection");
commands.put("//contract", "[Num] <Dir> - Contracts the selection"); commands.put("//contract", "[Num] <Dir> - Contracts the selection");
@ -684,6 +685,13 @@ public class WorldEditController {
player.print("Tree tool equipped. Right click with a pickaxe."); player.print("Tree tool equipped. Right click with a pickaxe.");
return true; return true;
// Big tree tool
} else if (split[0].equalsIgnoreCase("/bigtree")) {
checkArgs(split, 0, 0, split[0]);
session.setTool(new BigTreePlanter());
player.print("Big tree tool equipped. Right click with a pickaxe.");
return true;
// Info tool // Info tool
} else if (split[0].equalsIgnoreCase("/info")) { } else if (split[0].equalsIgnoreCase("/info")) {
checkArgs(split, 0, 0, split[0]); checkArgs(split, 0, 0, split[0]);

View File

@ -104,6 +104,12 @@ public class BukkitWorld extends LocalWorld {
return false; return false;
} }
@Override
public boolean generateBigTree(EditSession editSession, Vector pt) {
// TODO Auto-generated method stub
return false;
}
@Override @Override
public void dropItem(Vector pt, int type, int count, int times) { public void dropItem(Vector pt, int type, int count, int times) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

View File

@ -0,0 +1,49 @@
// $Id$
/*
* WorldEdit
* Copyright (C) 2010 sk89q <http://www.sk89q.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.superpickaxe;
import com.sk89q.worldedit.*;
/**
* Plants a big tree.
*
* @author sk89q
*/
public class BigTreePlanter implements SuperPickaxeMode {
@Override
public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
EditSession editSession =
new EditSession(server, world, session.getBlockChangeLimit());
try {
if (!world.generateBigTree(editSession, clicked)) {
player.printError("Notch won't let you put a tree there.");
}
} finally {
session.remember(editSession);
}
return true;
}
}

View File

@ -27,7 +27,6 @@ import com.sk89q.worldedit.*;
* @author sk89q * @author sk89q
*/ */
public class TreePlanter implements SuperPickaxeMode { public class TreePlanter implements SuperPickaxeMode {
@Override @Override
public boolean act(ServerInterface server, LocalConfiguration config, public boolean act(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, WorldVector clicked) { LocalPlayer player, LocalSession session, WorldVector clicked) {