--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/HoerupUtilsPlugin.java 2012/09/23 18:56:24 1851 +++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/HoerupUtilsPlugin.java 2013/04/29 19:29:51 1974 @@ -1,19 +1,24 @@ package dk.thoerup.bukkit.hoeruputils; +import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; +import com.sun.net.httpserver.HttpServer; + import dk.thoerup.bukkit.hoeruputils.chests.AdvancedChest; import dk.thoerup.bukkit.hoeruputils.chests.ChestBean; import dk.thoerup.bukkit.hoeruputils.creative.GeneralContractorCommands; import dk.thoerup.bukkit.hoeruputils.message.MessageBean; import dk.thoerup.bukkit.hoeruputils.message.MessageWrapper; import dk.thoerup.bukkit.hoeruputils.secretdoor.DoorBlockListener; -import dk.thoerup.bukkit.hoeruputils.web.WebLoader; +import dk.thoerup.bukkit.hoeruputils.web.BanListener; +import dk.thoerup.bukkit.hoeruputils.web.StatusListener; import dk.thoerup.bukkit.hoeruputils.web.WebUser; import dk.thoerup.bukkit.hoeruputils.web.WebUserCommand; @@ -21,10 +26,13 @@ @Override public void onDisable() { - // TODO Auto-generated method stub + if ( server != null ) { + server.stop( 0 ); + } } MessageWrapper messageWrapper; + HttpServer server = null; @Override @@ -50,6 +58,8 @@ DiverCommand diver = new DiverCommand(this ); getCommand("diver").setExecutor( diver ); + + getCommand("opkill").setExecutor( new OpkillCommand() ); GeneralContractorCommands generalContractor = new GeneralContractorCommands(); getCommand("replay").setExecutor( generalContractor ); @@ -63,6 +73,8 @@ getCommand("spawn").setExecutor( new SpawnCommand() ); getCommand("template").setExecutor( new TemplateCommand(this) ); + getCommand("regenerate").setExecutor( new RegenerateCommand() ); + LogintimeHandler logintimeHandler = new LogintimeHandler( this.getDataFolder() ); @@ -73,6 +85,11 @@ MotdHandler motd = new MotdHandler(this); getCommand("motd").setExecutor( motd ); pm.registerEvents( motd, this); + + WayPoint wp = new WayPoint(this); + getCommand("waypoint").setExecutor( wp ); + getCommand("setwaypoint").setExecutor( wp ); + pm.registerEvents( wp, this); pm.registerEvents(logintimeHandler, this); @@ -82,10 +99,19 @@ pm.registerEvents(diver, this); pm.registerEvents(new EndermanStopper(), this); - - - - + + Jail jail = new Jail(this); + pm.registerEvents(jail, this); + getCommand("jail").setExecutor( jail ); + + StickyChunk chunks = new StickyChunk(); + pm.registerEvents(chunks, this); + getCommand("stickychunk").setExecutor(chunks); + + Mute mute = new Mute(this); + pm.registerEvents(mute, this); + getCommand("mute").setExecutor(mute); + getCommand("unmute").setExecutor(mute); Runnable ddlInstaller = new Runnable() { @@ -110,7 +136,7 @@ //pm.registerEvent(Event.Type.CUSTOM_EVENT, new StatusListener(getServer(), logintimeHandler.getConfig(), home.getConfig() ), Priority.Normal, this); //pm.registerEvent(Event.Type.CUSTOM_EVENT, new MessageListener(getServer()), Priority.Normal, this); - try { + /*try { try { //først probes om klassen i det hele taget findes Class.forName("de.codeinfection.quickwango.ApiBukkit.ApiServer.ApiController"); //if it fails it throws an exception @@ -123,6 +149,18 @@ } } catch (Throwable e) { //instead of ClassNotFoundException + NoSuchMethodException + InvocationTargetException + IllegalAccessException getLogger().warning("Could not find ApiBukkit - web status is disabled (" + e.getClass().getName() + ":" + e.getMessage() + ")" ); + }*/ + + try { + InetSocketAddress adr = new InetSocketAddress("127.0.0.1", 9999); + server = HttpServer.create(adr, 20); + server.createContext("/bans", new BanListener(this, getServer()) ); + server.createContext("/webstatus", new StatusListener(this, getServer(),logintimeHandler.getConfig(), home.getConfig()) ); + server.start(); + + } catch(Exception e) { + getLogger().log(Level.SEVERE, "Error loading webserver", e); + } @@ -130,10 +168,13 @@ DoorBlockListener secretDoor = new DoorBlockListener(this); pm.registerEvents(secretDoor, this); - pm.registerEvents(secretDoor.getPlayerListener(), this); - + pm.registerEvents(secretDoor.getPlayerListener(), this); } + + + + public MessageWrapper getMessageWrapper() { return messageWrapper; }