--- miscJava/minecraft-plugins/hoeruputils/src/HoerupUtils.java 2010/10/19 17:16:40 1174 +++ miscJava/minecraft-plugins/hoeruputils/src/HoerupUtils.java 2010/11/02 13:53:49 1184 @@ -1,28 +1,69 @@ import java.util.logging.*; +import java.util.*; public class HoerupUtils extends Plugin { final static Logger log = Logger.getLogger("HoerupUtils"); + //private boolean adminDestroy = false; + private Set adminDestroyers = new HashSet(); + + private void registerCommands() { + etc e = etc.getInstance(); + e.addCommand("/setpos", "[x] [z] - Teleports you to the given coordinates"); + e.addCommand("/whereis", "[player] - Tells you the position of another player"); + e.addCommand("/fillarea", ""); + e.addCommand("/levelarea", ""); + e.addCommand("/setsurface", ""); + } @Override - public void disable() {} + public void disable() { + registerCommands(); + } @Override - public void enable() {} + public void enable() { + etc e = etc.getInstance(); + e.removeCommand("/setpos"); + e.removeCommand("/whereis"); + e.removeCommand("/fillarea"); + e.removeCommand("/levelarea"); + e.removeCommand("/setsurface"); + } @Override public void initialize() { PluginLoader loader = etc.getLoader(); loader.addListener( PluginLoader.Hook.COMMAND, new HoerupUtilsPlugin(), this, PluginListener.Priority.MEDIUM ); + loader.addListener( PluginLoader.Hook.BLOCK_DESTROYED, new AdminDestroy(), this, PluginListener.Priority.MEDIUM ); + + + registerCommands(); } + final static int HAND_EMPTY = -1; - public static class HoerupUtilsPlugin extends PluginListener { - final static String USAGE = "Usage: /setpos [height]"; - final static int AIRBLOCK = 0; //block id = 0 is air + public class AdminDestroy extends PluginListener { + public boolean onBlockDestroy(Player player, Block block) { + if (player.isAdmin() && adminDestroyers.contains(player.getName() ) ) { + if (player.getItemInHand() == HAND_EMPTY) { + block.setType(0); + etc.getServer().setBlock(block); + return true; + } + } + return false; + } + } + + public class HoerupUtilsPlugin extends PluginListener { + final static String USAGE = "Usage: /setpos [x] [z] "; + final static int BLOCK_AIR = 0; //block id = 0 is air + final static int BLOCK_GRASS = 2; + final static int BLOCK_DIRT = 3; @@ -57,21 +98,46 @@ private boolean isFree(int x, int y, int z) { Server srv = etc.getServer(); - return (srv.getBlockIdAt(x,y,z) == AIRBLOCK && srv.getBlockIdAt(x,y+1,z) == AIRBLOCK); + return (srv.getBlockIdAt(x,y,z) == BLOCK_AIR && srv.getBlockIdAt(x,y+1,z) == BLOCK_AIR); } + + + public void adminDestroy(Player player, String[] split) { + String name = player.getName(); + if (adminDestroyers.contains(name) ) { + adminDestroyers.remove(name); + player.sendMessage("Admindestroy disabled"); + } else { + adminDestroyers.add(name); + player.sendMessage("Admindestroy enabled"); + } + } @Override public boolean onCommand(Player player, java.lang.String[] split) { - if( split[0].equals("/setpos") && player.canUseCommand("/setpos") ) { + if ( split[0].equals("/admindestroy") && player.canUseCommand("/admindestroy") ) { + adminDestroy(player,split); + return true; + } else if( split[0].equals("/setpos") && player.canUseCommand("/setpos") ) { setPos(player, split); return true; } else if ( split[0].equals("/whereis" ) && player.canUseCommand("/whereis")) { whereIs(player, split); return true; } else if (split[0].equals("/levelarea") && player.canUseCommand("/levelarea")) { - levelArea(player, split); + if (validateLevelOrFill(player,split)) { + levelArea(player, split); + } + return true; + } else if (split[0].equals("/fillarea") && player.canUseCommand("/fillarea")) { + if (validateLevelOrFill(player,split)) { + fillArea(player, split); + } + return true; + } else if (split[0].equals("/setsurface") && player.canUseCommand("/setsurface")) { + setSurface(player,split); return true; } else { return false; @@ -79,32 +145,150 @@ } - private void levelArea(Player player, String[] split) { - if (split.length != 2) { - player.sendMessage("Usage: /levelarea "); + int roundPos(double input) { + int result = (int) input; + if (input < 0.0) { + result--; + } + + return result; + } + + private void setSurface(Player player, String[] split) { + int valid_block_array[] = {1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 35, 41, 42, 43, 44, 45, 46, 48, 49, 56, 57, 73, 74, 79, 80, 82} ; + + final int BLOCK_MAX = 86; + + if (split.length != 3) { + player.sendMessage("Usage /setsurface [radius] [blockID]"); return; } - + + int radius; try { radius = Integer.parseInt(split[1]); } catch (Exception e) { - player.sendMessage("levelarea: radius must be an integer"); + player.sendMessage("setsurface: radius must be an integer"); return; } if (radius > 20) { - player.sendMessage("levelarea: radius may not exceed 20"); + player.sendMessage("setsurface: radius may not exceed 20"); + return; + } + + + int blockid; + try { + blockid = Integer.parseInt(split[2]); + } catch (Exception e) { + player.sendMessage("setsurface: blockid must be an integer"); return; } + boolean validblock = false; + for (int i=0; i 3) { + player.sendMessage("Usage: " + split[0] + " [radius]"); + return false; + } + + int radius; + try { + radius = Integer.parseInt(split[1]); + } catch (Exception e) { + player.sendMessage(split[0] + ": radius must be an integer"); + return false; + } + + if (radius > 20) { + player.sendMessage(split[0] + ": radius may not exceed 20"); + return false; + } + + if (split.length == 3) { + try { + Integer.parseInt( split[2] ); + } catch (Exception e) { + player.sendMessage(split[0] + ": radius must be an integer"); + return false; + } + } + + return true; + } + + private void fillArea(Player player, String[] split) { + int radius = Integer.parseInt(split[1]); + + int material = BLOCK_DIRT; + if (split.length == 3) { + material = Integer.parseInt( split[2] ); + } + + System.out.println("Player " + player.getName() + " used fillarea with radius=" + radius); + + + int playerX = roundPos( player.getX() ); + int playerY = (int) player.getY(); + int playerZ = roundPos( player.getZ() ); + + Server srv = etc.getServer(); + + for (int x=(playerX-radius); x<=(playerX+radius); x++) { + for (int z=(playerZ-radius); z<=(playerZ+radius); z++) { + + for (int y=getGroundLevel(x,z); y" ); return; }