--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/HoerupUtilsPlugin.java 2012/03/13 17:41:56 1732 +++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/HoerupUtilsPlugin.java 2012/04/05 14:10:28 1778 @@ -1,14 +1,17 @@ package dk.thoerup.bukkit.hoeruputils; +import java.util.ArrayList; +import java.util.List; + import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import de.codeinfection.quickwango.ApiBukkit.ApiBukkit; -import de.codeinfection.quickwango.ApiBukkit.ApiServer.ApiManager; 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.StatusListener; +import dk.thoerup.bukkit.hoeruputils.web.WebLoader; public class HoerupUtilsPlugin extends JavaPlugin { @@ -16,6 +19,8 @@ public void onDisable() { // TODO Auto-generated method stub } + + MessageWrapper messageWrapper; @Override @@ -25,7 +30,7 @@ //getCommand("mapgen").setExecutor(new MapgenCommand(this)); getCommand("eternalday").setExecutor(new EternalDayCommand(this)); getCommand("getpos").setExecutor( new GetposCommand() ); - getCommand("msg").setExecutor( new MsgCommand( getServer() ) ); + getCommand("msg").setExecutor( new MsgCommand( this ) ); getCommand("tp").setExecutor( new TeleportCommand() ); getCommand("wall").setExecutor( new WallCommand() ); @@ -48,7 +53,11 @@ getCommand("slopearea").setExecutor( generalContractor ); getCommand("setsurface").setExecutor( generalContractor ); getCommand("platform").setExecutor( generalContractor ); + getCommand("cylinder").setExecutor( generalContractor ); + getCommand("createcave").setExecutor( generalContractor ); + + getCommand("template").setExecutor( new TemplateCommand(this) ); LogintimeHandler logintimeHandler = new LogintimeHandler( this.getDataFolder() ); @@ -62,21 +71,45 @@ pm.registerEvents(diver, this); - - pm.registerEvents(new EndermanStopper(), this); + pm.registerEvents(new EndermanStopper(), this); + + + + + + Runnable ddlInstaller = new Runnable() { + @Override + public void run() { + System.out.println("installddl"); + installDDL(); + } + }; + messageWrapper = new MessageWrapper(this, ddlInstaller); + pm.registerEvents( messageWrapper, this); + + SnitchingChest snitch = new SnitchingChest(this, ddlInstaller); + getCommand("snitchingchest").setExecutor(snitch); + pm.registerEvents( snitch, this); + //register web plugins //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); - ApiBukkit api = (ApiBukkit) pm.getPlugin("ApiBukkit") ; - if ( api != null) { - StatusListener status = new StatusListener(this, getServer(), logintimeHandler.getConfig(), home.getConfig() ); - //api.setRequestController("webstatus", status ); - ApiManager.getInstance().registerController( status ); - } else { - System.out.println("Could not find ApiBukkit"); + 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 + WebLoader.getInstance().load(this, logintimeHandler.getConfig(), home.getConfig()); + + getLogger().info("ApiBukkit found, status listener registered"); + + } catch (ClassNotFoundException e) { + getLogger().warning("Could not find ApiBukkit - web status is disabled" ); + } + } catch (Throwable e) { //instead of ClassNotFoundException + NoSuchMethodException + InvocationTargetException + IllegalAccessException + getLogger().warning("Could not find ApiBukkit - web status is disabled (" + e.getClass().getName() + ":" + e.getMessage() + ")" ); } @@ -87,6 +120,21 @@ pm.registerEvents(secretDoor.getPlayerListener(), this); } + + public MessageWrapper getMessageWrapper() { + return messageWrapper; + } + + //@SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public List> getDatabaseClasses() { + List> list = new ArrayList>(); + + list.add(MessageBean.class); + list.add(SnitchingChestBean.class); + + return list; + } private void deprecated() { /*